Remove the --proprietary-license option

It is not necessary since we are not going to copyright the
generated code.

6 files changed, 5 insertions, 40 deletions

diff --git a/odb/generator.cxx b/odb/generator.cxx
index 87cc56f..9e1da47 100644
--- a/odb/generator.cxx
+++ b/odb/generator.cxx
@@ -26,8 +26,8 @@ using semantics::path;
 namespace
 {
   static char const cxx_header[] =
-    "// This code was generated by ODB, an object persistence compiler\n"
-    "// for C++.\n"
+    "// This code was generated by CodeSynthesis ODB object persistence\n"
+    "// compiler for C++.\n"
     "//\n\n";
 
   /*
diff --git a/odb/odb.cxx b/odb/odb.cxx
index 8e864c7..b53b7ea 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -183,18 +183,9 @@ main (int argc, char* argv[])
         ODB_COMPILER_VERSION_STR << endl
         << "Copyright (C) 2009-2010 Code Synthesis Tools CC" << endl;
 
-      if (ops.proprietary_license ())
-      {
-        e << "The compiler was invoked in the Proprietary License mode. You "
-          << "should have\nreceived a proprietary license from Code Synthesis "
-          << "Tools CC that entitles\nyou to use it in this mode." << endl;
-      }
-      else
-      {
-        e << "This is free software; see the source for copying conditions. "
-          << "There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS "
-          << "FOR A PARTICULAR PURPOSE." << endl;
-      }
+      e << "This is free software; see the source for copying conditions. "
+        << "There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS "
+        << "FOR A PARTICULAR PURPOSE." << endl;
 
       return 0;
     }
diff --git a/odb/options.cli b/odb/options.cli
index 0418eb5..1454d9a 100644
--- a/odb/options.cli
+++ b/odb/options.cli
@@ -64,12 +64,6 @@ class options
     "Add <prefix> to the generated \cb{#include} directive paths."
   };
 
-  bool --proprietary-license
-  {
-    "Indicate that the generated code is licensed under a proprietary
-     license instead of the GPL."
-  };
-
   // This is a "fake" option in that it is actually handled by
   // argv_file_scanner. We have it here to get the documentation.
   //
diff --git a/odb/options.cxx b/odb/options.cxx
index 295d22c..c5c2c0b 100644
--- a/odb/options.cxx
+++ b/odb/options.cxx
@@ -497,7 +497,6 @@ options (int& argc,
   cxx_suffix_ (".cxx"),
   include_with_brackets_ (),
   include_prefix_ (),
-  proprietary_license_ (),
   options_file_ (),
   trace_ ()
 {
@@ -521,7 +520,6 @@ options (int start,
   cxx_suffix_ (".cxx"),
   include_with_brackets_ (),
   include_prefix_ (),
-  proprietary_license_ (),
   options_file_ (),
   trace_ ()
 {
@@ -545,7 +543,6 @@ options (int& argc,
   cxx_suffix_ (".cxx"),
   include_with_brackets_ (),
   include_prefix_ (),
-  proprietary_license_ (),
   options_file_ (),
   trace_ ()
 {
@@ -571,7 +568,6 @@ options (int start,
   cxx_suffix_ (".cxx"),
   include_with_brackets_ (),
   include_prefix_ (),
-  proprietary_license_ (),
   options_file_ (),
   trace_ ()
 {
@@ -593,7 +589,6 @@ options (::cli::scanner& s,
   cxx_suffix_ (".cxx"),
   include_with_brackets_ (),
   include_prefix_ (),
-  proprietary_license_ (),
   options_file_ (),
   trace_ ()
 {
@@ -628,9 +623,6 @@ print_usage (::std::ostream& os)
   os << "--include-prefix <prefix>  Add <prefix> to the generated '#include' directive" << ::std::endl
      << "                           paths." << ::std::endl;
 
-  os << "--proprietary-license      Indicate that the generated code is licensed under a" << ::std::endl
-     << "                           proprietary license instead of the GPL." << ::std::endl;
-
   os << "--options-file <file>      Read additional options from <file> with each option" << ::std::endl
      << "                           appearing on a separate line optionally followed by" << ::std::endl
      << "                           space and an option value." << ::std::endl;
@@ -668,8 +660,6 @@ struct _cli_options_map_init
     &::cli::thunk< options, bool, &options::include_with_brackets_ >;
     _cli_options_map_["--include-prefix"] = 
     &::cli::thunk< options, std::string, &options::include_prefix_ >;
-    _cli_options_map_["--proprietary-license"] = 
-    &::cli::thunk< options, bool, &options::proprietary_license_ >;
     _cli_options_map_["--options-file"] = 
     &::cli::thunk< options, std::string, &options::options_file_ >;
     _cli_options_map_["--trace"] = 
diff --git a/odb/options.hxx b/odb/options.hxx
index cbd112e..daf3d31 100644
--- a/odb/options.hxx
+++ b/odb/options.hxx
@@ -322,9 +322,6 @@ class options
   const std::string&
   include_prefix () const;
 
-  const bool&
-  proprietary_license () const;
-
   const std::string&
   options_file () const;
 
@@ -352,7 +349,6 @@ class options
   std::string cxx_suffix_;
   bool include_with_brackets_;
   std::string include_prefix_;
-  bool proprietary_license_;
   std::string options_file_;
   bool trace_;
 };
diff --git a/odb/options.ixx b/odb/options.ixx
index 087a3ef..dfe6995 100644
--- a/odb/options.ixx
+++ b/odb/options.ixx
@@ -201,12 +201,6 @@ include_prefix () const
   return this->include_prefix_;
 }
 
-inline const bool& options::
-proprietary_license () const
-{
-  return this->proprietary_license_;
-}
-
 inline const std::string& options::
 options_file () const
 {