From 1804cfc0480c64b95ef347bd53baeb3599394deb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 7 May 2010 11:23:46 +0200
Subject: Remove the --proprietary-license option

It is not necessary since we are not going to copyright the
generated code.
---
 odb/options.cxx | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'odb/options.cxx')

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"] = 
-- 
cgit v1.1