Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]

build/Jamfile.v2

@@ -12,8 +12,6 @@ SOURCES =
 lib boost_program_options
     : $(SOURCES).cpp
     : <link>shared:<define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1 # tell source we're building dll's
-      # See https://svn.boost.org/trac/boost/ticket/5049
-      <target-os>hpux,<toolset>gcc:<define>_INCLUDE_STDC__SOURCE_199901
     :
     : <link>shared:<define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1
     ;

doc/Jamfile.v2

@@ -5,7 +5,6 @@ toolset.using doxygen ;
 boostbook program_option 
     : program_options.xml 
     : <implicit-dependency>autodoc 
-      <xsl:param>boost.root=../../../..
       <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
     ;
 

doc/howto.xml

@@ -107,7 +107,7 @@ if (vm.count("response-file")) {
      // Load the file and tokenize it
      ifstream ifs(vm["response-file"].as<string>().c_str());
      if (!ifs) {
-         cout << "Could not open the response file\n";
+         cout << "Could no open the response file\n";
          return 1;
      }
      // Read the whole file into a string
@@ -115,8 +115,7 @@ if (vm.count("response-file")) {
      ss << ifs.rdbuf();
      // Split the file content
      char_separator<char> sep(" \n\r");
-     std::string ResponsefileContents( ss.str() );
-     tokenizer<char_separator<char> > tok(ResponsefileContents, sep);
+     tokenizer<char_separator<char> > tok(ss.str(), sep);
      vector<string> args;
      copy(tok.begin(), tok.end(), back_inserter(args));
      // Parse the file and store the options
@@ -147,7 +146,7 @@ if (vm.count("response-file")) {
 vector&lt;string&gt; args = split_winmain(lpCmdLine);
 store(command_line_parser(args).options(desc).run(), vm);
 </programlisting>      
-      The <code>split_winmain</code> function is overloaded for <code>wchar_t</code> strings, so can
+      The function is an overload for <code>wchar_t</code> strings, so can
       also be used in Unicode applications.
     </para>
 
@@ -296,7 +295,7 @@ void validate(boost::any& v,
     if (regex_match(s, match, r)) {
         v = any(magic_number(lexical_cast<int>(match[1])));
     } else {
-        throw validation_error(validation_error::invalid_option_value);
+        throw validation_error("invalid value");
     }        
 }
 ]]>        

doc/overview.xml

@@ -181,7 +181,7 @@ options_description desc;
 desc.add_options()
     ("help", "produce help message")
     ("compression", value<string>(), "compression level")
-    ("verbose", value<string>()->implicit_value("0"), "verbosity level")
+    ("verbose", value<string>()->zero_tokens(), "verbosity level")
     ("email", value<string>()->multitoken(), "email to send to")
     ;
       </programlisting>

doc/tutorial.xml

@@ -77,13 +77,13 @@ if (vm.count("compression")) {
   <para>It's now a good time to try compiling the code yourself, but if
     you're not yet ready, here's an example session:
 <screen>
-$ <userinput>bin/gcc/debug/first</userinput>
+$<userinput>bin/gcc/debug/first</userinput>
 Compression level was not set.
-$ <userinput>bin/gcc/debug/first --help</userinput>
+$<userinput>bin/gcc/debug/first --help</userinput>
 Allowed options:
   --help                 : produce help message
   --compression arg      : set compression level
-$ <userinput>bin/gcc/debug/first --compression 10</userinput>
+$<userinput>bin/gcc/debug/first --compression 10</userinput>
 Compression level was set to 10.
     </screen>
   </para>
@@ -199,16 +199,16 @@ cout &lt;&lt; &quot;Optimization level is &quot; &lt;&lt; opt &lt;&lt; &quot;\n&
 
   <para>Here's an example session:
     <screen>
-$ <userinput>bin/gcc/debug/options_description --help</userinput>
+$<userinput>bin/gcc/debug/options_description --help</userinput>
 Usage: options_description [options]
 Allowed options:
   --help                 : produce help message
   --optimization arg     : optimization level
   -I [ --include-path ] arg : include path
   --input-file arg       : input file
-$ <userinput>bin/gcc/debug/options_description</userinput>
+$bin/gcc/debug/options_description
 Optimization level is 10
-$ <userinput>bin/gcc/debug/options_description --optimization 4 -I foo a.cpp</userinput>
+$<userinput>bin/gcc/debug/options_description --optimization 4 -I foo a.cpp</userinput>
 Include paths are: foo
 Input files are: a.cpp
 Optimization level is 4
@@ -308,10 +308,10 @@ visible.add(generic).add(config);
 
     <para>Here's an example session:
 <screen>
-$ <userinput>bin/gcc/debug/multiple_sources</userinput>
+$<userinput>bin/gcc/debug/multiple_sources</userinput>
 Include paths are: /opt
 Optimization level is 1
-$ <userinput>bin/gcc/debug/multiple_sources --help</userinput>
+$<userinput>bin/gcc/debug/multiple_sources --help</userinput>
 Allows options:
 
 Generic options:
@@ -322,7 +322,7 @@ Configuration:
   --optimization n       : optimization level
   -I [ --include-path ] path : include path
 
-$ <userinput>bin/gcc/debug/multiple_sources --optimization=4 -I foo a.cpp b.cpp</userinput>
+$<userinput>bin/gcc/debug/multiple_sources --optimization=4 -I foo a.cpp b.cpp</userinput>
 Include paths are: foo /opt
 Input files are: a.cpp b.cpp
 Optimization level is 4

example/Jamfile.v2

@@ -2,7 +2,6 @@
 project 
     : requirements <library>../build//boost_program_options
       <hardcode-dll-paths>true
-      <link>static
     ;
 
 exe first : first.cpp ;

example/first.cpp

@@ -29,7 +29,7 @@ int main(int ac, char* av[])
 
         if (vm.count("help")) {
             cout << desc << "\n";
-            return 0;
+            return 1;
         }
 
         if (vm.count("compression")) {

example/multiple_sources.cpp

@@ -79,7 +79,7 @@ int main(int ac, char* av[])
         ifstream ifs(config_file.c_str());
         if (!ifs)
         {
-            cout << "can not open config file: " << config_file << "\n";
+			   cout << "can not open config file: " << config_file << "\n";
             return 0;
         }
         else

include/boost/program_options/config.hpp

@@ -34,14 +34,17 @@
 #endif  // BOOST_VERSION
 
 ///////////////////////////////////////////////////////////////////////////////
+// Windows DLL suport
+#ifdef BOOST_HAS_DECLSPEC
 #if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_PROGRAM_OPTIONS_DYN_LINK)
 // export if this is our own source, otherwise import:
 #ifdef BOOST_PROGRAM_OPTIONS_SOURCE
-# define BOOST_PROGRAM_OPTIONS_DECL BOOST_SYMBOL_EXPORT
+# define BOOST_PROGRAM_OPTIONS_DECL __declspec(dllexport)
 #else
-# define BOOST_PROGRAM_OPTIONS_DECL BOOST_SYMBOL_IMPORT
+# define BOOST_PROGRAM_OPTIONS_DECL __declspec(dllimport)
 #endif  // BOOST_PROGRAM_OPTIONS_SOURCE
 #endif  // DYN_LINK
+#endif  // BOOST_HAS_DECLSPEC
 
 #ifndef BOOST_PROGRAM_OPTIONS_DECL
 #define BOOST_PROGRAM_OPTIONS_DECL

include/boost/program_options/detail/cmdline.hpp

@@ -22,11 +22,6 @@
 #include <string>
 #include <vector>
 
-#if defined(BOOST_MSVC)
-#   pragma warning (push)
-#   pragma warning (disable:4251) // class 'std::vector<_Ty>' needs to have dll-interface to be used by clients of class 'boost::program_options::positional_options_description'
-#endif
-
 namespace boost { namespace program_options { namespace detail {
 
     /** Command line parser class. Main requirements were:
@@ -139,9 +134,5 @@ namespace boost { namespace program_options { namespace detail {
     
 }}}
 
-#if defined(BOOST_MSVC)
-#   pragma warning (pop)
-#endif
-
 #endif
 

include/boost/program_options/detail/parsers.hpp

@@ -29,18 +29,18 @@ namespace boost { namespace program_options {
     template<class charT>
     basic_command_line_parser<charT>::
     basic_command_line_parser(const std::vector<
-                              std::basic_string<charT> >& xargs)
-       : detail::cmdline(to_internal(xargs))
+                              std::basic_string<charT> >& args)
+       : detail::cmdline(to_internal(args))
     {}
 
 
     template<class charT>
     basic_command_line_parser<charT>::
-    basic_command_line_parser(int argc, const charT* const argv[])
+    basic_command_line_parser(int argc, charT* argv[])
     : detail::cmdline(
         // Explicit template arguments are required by gcc 3.3.1 
         // (at least mingw version), and do no harm on other compilers.
-        to_internal(detail::make_vector<charT, const charT* const*>(argv+1, argv+argc+!argc)))
+        to_internal(detail::make_vector<charT, charT**>(argv+1, argv+argc+!argc)))
     {}
 
     
@@ -64,9 +64,9 @@ namespace boost { namespace program_options {
 
     template<class charT>
     basic_command_line_parser<charT>& 
-    basic_command_line_parser<charT>::style(int xstyle)
+    basic_command_line_parser<charT>::style(int style)
     {
-        detail::cmdline::style(xstyle);
+        detail::cmdline::style(style);
         return *this;
     }
 
@@ -111,7 +111,7 @@ namespace boost { namespace program_options {
 
     template<class charT>
     basic_parsed_options<charT>
-    parse_command_line(int argc, const charT* const argv[],
+    parse_command_line(int argc, charT* argv[],
                        const options_description& desc,
                        int style,
                        function1<std::pair<std::string, std::string>, 

include/boost/program_options/detail/value_semantic.hpp

@@ -143,9 +143,9 @@ namespace boost { namespace program_options {
                    a validator for class T, we use it even
                    when parsing vector<T>.  */
                 boost::any a;
-                std::vector<std::basic_string<charT> > cv;
-                cv.push_back(s[i]);
-                validate(a, cv, (T*)0, 0);                
+                std::vector<std::basic_string<charT> > v;
+                v.push_back(s[i]);
+                validate(a, v, (T*)0, 0);                
                 tv->push_back(boost::any_cast<T>(a));
             }
             catch(const bad_lexical_cast& /*e*/) {

include/boost/program_options/errors.hpp

@@ -13,18 +13,14 @@
 #include <stdexcept>
 #include <vector>
 
-#if defined(BOOST_MSVC)
-#   pragma warning (push)
-#   pragma warning (disable:4275) // non dll-interface class 'std::logic_error' used as base for dll-interface class 'boost::program_options::error'
-#   pragma warning (disable:4251) // class 'std::vector<_Ty>' needs to have dll-interface to be used by clients of class 'boost::program_options::ambiguous_option'
-#endif
+
 
 namespace boost { namespace program_options {
 
     /** Base class for all errors in the library. */
     class BOOST_PROGRAM_OPTIONS_DECL error : public std::logic_error {
     public:
-        error(const std::string& xwhat) : std::logic_error(xwhat) {}
+        error(const std::string& what) : std::logic_error(what) {}
     };
 
     class BOOST_PROGRAM_OPTIONS_DECL invalid_syntax : public error {
@@ -82,9 +78,9 @@ namespace boost { namespace program_options {
     class BOOST_PROGRAM_OPTIONS_DECL ambiguous_option : public error {
     public:
         ambiguous_option(const std::string& name, 
-                         const std::vector<std::string>& xalternatives)
+                         const std::vector<std::string>& alternatives)
         : error(std::string("ambiguous option ").append(name))
-        , m_alternatives(xalternatives)
+        , m_alternatives(alternatives)
         , m_option_name(name)
         {}
 
@@ -236,8 +232,5 @@ namespace boost { namespace program_options {
      };
 }}
 
-#if defined(BOOST_MSVC)
-#   pragma warning (pop)
-#endif
 
 #endif

include/boost/program_options/option.hpp

@@ -28,10 +28,10 @@ namespace boost { namespace program_options {
         , unregistered(false) 
         , case_insensitive(false)
         {}
-        basic_option(const std::string& xstring_key, 
-               const std::vector< std::string> &xvalue)
-        : string_key(xstring_key)
-        , value(xvalue)
+        basic_option(const std::string& string_key, 
+               const std::vector< std::string> &value)
+        : string_key(string_key)
+        , value(value)
         , unregistered(false)
         , case_insensitive(false)
         {}

include/boost/program_options/options_description.hpp

@@ -25,12 +25,6 @@
 
 #include <iosfwd>
 
-#if defined(BOOST_MSVC)
-#   pragma warning (push)
-#   pragma warning (disable:4251) // class 'boost::shared_ptr<T>' needs to have dll-interface to be used by clients of class 'boost::program_options::option_description'
-#endif
-
-
 /** Boost namespace */
 namespace boost { 
 /** Namespace for the library. */
@@ -71,7 +65,7 @@ namespace program_options {
             The 'name' parameter is interpreted by the following rules:
             - if there's no "," character in 'name', it specifies long name
             - otherwise, the part before "," specifies long name and the part
-            after -- short name.
+            after -- long name.
         */
         option_description(const char* name,
                            const value_semantic* s);
@@ -87,12 +81,12 @@ namespace program_options {
         enum match_result { no_match, full_match, approximate_match };
 
         /** Given 'option', specified in the input source,
-            returns 'true' if 'option' specifies *this.
+            return 'true' is 'option' specifies *this.
         */
         match_result match(const std::string& option, bool approx,
                            bool long_ignore_case, bool short_ignore_case) const;
 
-        /** Returns the key that should identify the option, in
+        /** Return the key that should identify the option, in
             particular in the variables_map class.
             The 'option' parameter is the option spelling from the
             input source.
@@ -113,7 +107,7 @@ namespace program_options {
         /// Returns the option name, formatted suitably for usage message. 
         std::string format_name() const;
 
-        /** Returns the parameter name and properties, formatted suitably for
+        /** Return the parameter name and properties, formatted suitably for
             usage message. */
         std::string format_parameter() const;
 
@@ -217,7 +211,7 @@ namespace program_options {
         friend BOOST_PROGRAM_OPTIONS_DECL std::ostream& operator<<(std::ostream& os, 
                                              const options_description& desc);
 
-        /** Outputs 'desc' to the specified stream, calling 'f' to output each
+        /** Output 'desc' to the specified stream, calling 'f' to output each
             option_description element. */
         void print(std::ostream& os) const;
 
@@ -253,12 +247,8 @@ namespace program_options {
     /** Class thrown when duplicate option description is found. */
     class BOOST_PROGRAM_OPTIONS_DECL duplicate_option_error : public error {
     public:
-        duplicate_option_error(const std::string& xwhat) : error(xwhat) {}
+        duplicate_option_error(const std::string& what) : error(what) {}
     };
 }}
 
-#if defined(BOOST_MSVC)
-#   pragma warning (pop)
-#endif
-
 #endif

include/boost/program_options/parsers.hpp

@@ -17,11 +17,6 @@
 #include <vector>
 #include <utility>
 
-#if defined(BOOST_MSVC)
-#   pragma warning (push)
-#   pragma warning (disable:4251) // class 'std::vector<_Ty>' needs to have dll-interface to be used by clients of class 'boost::program_options::basic_parsed_options<wchar_t>'
-#endif
-
 namespace boost { namespace program_options {
 
     class options_description;
@@ -36,8 +31,8 @@ namespace boost { namespace program_options {
     template<class charT>
     class basic_parsed_options {
     public:
-        explicit basic_parsed_options(const options_description* xdescription) 
-        : description(xdescription) {}
+        explicit basic_parsed_options(const options_description* description) 
+        : description(description) {}
         /** Options found in the source. */
         std::vector< basic_option<charT> > options;
         /** Options description that was used for parsing. 
@@ -100,7 +95,7 @@ namespace boost { namespace program_options {
         /** Creates a command line parser for the specified arguments
             list. The parameters should be the same as passed to 'main'.
         */
-        basic_command_line_parser(int argc, const charT* const argv[]);
+        basic_command_line_parser(int argc, charT* argv[]);
 
         /** Sets options descriptions to use. */
         basic_command_line_parser& options(const options_description& desc);
@@ -144,7 +139,7 @@ namespace boost { namespace program_options {
      */
     template<class charT>
     basic_parsed_options<charT>
-    parse_command_line(int argc, const charT* const argv[],
+    parse_command_line(int argc, charT* argv[],
                        const options_description&,
                        int style = 0,
                        function1<std::pair<std::string, std::string>, 
@@ -260,10 +255,6 @@ namespace boost { namespace program_options {
 
 }}
 
-#if defined(BOOST_MSVC)
-#   pragma warning (pop)
-#endif
-
 #undef DECL
 
 #include "boost/program_options/detail/parsers.hpp"

include/boost/program_options/positional_options.hpp

@@ -11,11 +11,6 @@
 #include <vector>
 #include <string>
 
-#if defined(BOOST_MSVC)
-#   pragma warning (push)
-#   pragma warning (disable:4251) // class 'std::vector<_Ty>' needs to have dll-interface to be used by clients of class 'boost::program_options::positional_options_description'
-#endif
-
 namespace boost { namespace program_options {
 
     /** Describes positional options. 
@@ -66,9 +61,5 @@ namespace boost { namespace program_options {
 
 }}
 
-#if defined(BOOST_MSVC)
-#   pragma warning (pop)
-#endif
-
 #endif
 

include/boost/program_options/value_semantic.hpp

@@ -261,21 +261,13 @@ namespace boost { namespace program_options {
             return this;
         }
 
-        /** Specifies that the value can span multiple tokens. 
-        */
+        /** Specifies that the value can span multiple tokens. */
         typed_value* multitoken()
         {
             m_multitoken = true;
             return this;
         }
 
-        /** Specifies that no tokens may be provided as the value of
-            this option, which means that only presense of the option
-            is significant. For such option to be useful, either the
-            'validate' function should be specialized, or the 
-            'implicit_value' method should be also used. In most
-            cases, you can use the 'bool_switch' function instead of
-            using this method. */
         typed_value* zero_tokens() 
         {
             m_zero_tokens = true;

include/boost/program_options/variables_map.hpp

@@ -16,11 +16,6 @@
 #include <map>
 #include <set>
 
-#if defined(BOOST_MSVC)
-#   pragma warning (push)
-#   pragma warning (disable:4251) // 'boost::program_options::variable_value::v' : class 'boost::any' needs to have dll-interface to be used by clients of class 'boost::program_options::variable_value
-#endif
-
 namespace boost { namespace program_options {
 
     template<class charT>
@@ -58,8 +53,8 @@ namespace boost { namespace program_options {
     class BOOST_PROGRAM_OPTIONS_DECL variable_value {
     public:
         variable_value() : m_defaulted(false) {}
-        variable_value(const boost::any& xv, bool xdefaulted) 
-        : v(xv), m_defaulted(xdefaulted) 
+        variable_value(const boost::any& v, bool defaulted) 
+        : v(v), m_defaulted(defaulted) 
         {}
 
         /** If stored value if of type T, returns that value. Otherwise,
@@ -153,9 +148,6 @@ namespace boost { namespace program_options {
         // Resolve conflict between inherited operators.
         const variable_value& operator[](const std::string& name) const
         { return abstract_variables_map::operator[](name); }
-
-        // Override to clear some extra fields.
-        void clear(); 
         
         void notify();
 
@@ -211,8 +203,4 @@ namespace boost { namespace program_options {
 
 }}
 
-#if defined(BOOST_MSVC)
-#   pragma warning (pop)
-#endif
-
 #endif

src/cmdline.cpp

@@ -277,7 +277,7 @@ namespace boost { namespace program_options { namespace detail {
         }
 
         /* If an key option is followed by a positional option,
-           can can consume more tokens (e.g. it's multitoken option),
+           can can consume more tokens (e.g. it's multitoke option),
            give those tokens to it.  */
         vector<option> result2;
         for (unsigned i = 0; i < result.size(); ++i)

src/options_description.cpp

@@ -174,13 +174,10 @@ namespace boost { namespace program_options {
     option_description::format_name() const
     {
         if (!m_short_name.empty())
-        {
-            return m_long_name.empty() 
-                ? m_short_name 
-                : string(m_short_name).append(" [ --").
-                  append(m_long_name).append(" ]");
-        }
-        return string("--").append(m_long_name);
+            return string(m_short_name).append(" [ --").
+            append(m_long_name).append(" ]");
+        else
+            return string("--").append(m_long_name);
     }
 
     std::string 
@@ -309,7 +306,6 @@ namespace boost { namespace program_options {
                                       bool short_ignore_case) const
     {
         shared_ptr<option_description> found;
-        bool had_full_match = false;
         vector<string> approximate_matches;
         vector<string> full_matches;
         
@@ -327,17 +323,15 @@ namespace boost { namespace program_options {
             if (r == option_description::full_match)
             {                
                 full_matches.push_back(m_options[i]->key(name));
-                found = m_options[i];
-                had_full_match = true;
             } 
             else 
             {                        
                 // FIXME: the use of 'key' here might not
                 // be the best approach.
                 approximate_matches.push_back(m_options[i]->key(name));
-                if (!had_full_match)
-                    found = m_options[i];
             }
+
+            found = m_options[i];
         }
         if (full_matches.size() > 1) 
             boost::throw_exception(

src/parsers.cpp

@@ -45,10 +45,7 @@
 // See: http://article.gmane.org/gmane.comp.lib.boost.devel/103843
 // See: http://lists.gnu.org/archive/html/bug-guile/2004-01/msg00013.html
 #if defined(__APPLE__) && defined(__DYNAMIC__)
-// The proper include for this is crt_externs.h, however it's not
-// available on iOS. The right replacement is not known. See
-// https://svn.boost.org/trac/boost/ticket/5053
-extern "C" { extern char ***_NSGetEnviron(void); }
+#include <crt_externs.h>
 #define environ (*_NSGetEnviron()) 
 #else
 #if defined(__MWERKS__)

src/variables_map.cpp

@@ -182,13 +182,6 @@ namespace boost { namespace program_options {
     : abstract_variables_map(next)
     {}
 
-    void variables_map::clear()
-    {
-        std::map<std::string, variable_value>::clear();
-        m_final.clear();
-        m_required.clear();
-    }
-
     const variable_value&
     variables_map::get(const std::string& name) const
     {

src/winmain.cpp

@@ -30,7 +30,6 @@ namespace boost { namespace program_options {
    
             std::string current;
             bool inside_quoted = false;
-            bool empty_quote = false;
             int backslash_count = 0;
             
             for(; i != e; ++i) {
@@ -39,7 +38,6 @@ namespace boost { namespace program_options {
                     // n/2 backslashes and is a quoted block delimiter
                     if (backslash_count % 2 == 0) {
                         current.append(backslash_count / 2, '\\');
-                        empty_quote = inside_quoted && current.empty();
                         inside_quoted = !inside_quoted;
                         // '"' preceded by odd number (n) of backslashes generates
                         // (n-1)/2 backslashes and is literal quote.
@@ -61,7 +59,6 @@ namespace boost { namespace program_options {
                         // Space outside quoted section terminate the current argument
                         result.push_back(current);
                         current.resize(0);
-                        empty_quote = false; 
                         for(;i != e && isspace((unsigned char)*i); ++i)
                             ;
                         --i;
@@ -77,7 +74,7 @@ namespace boost { namespace program_options {
         
             // If we have non-empty 'current' or we're still in quoted
             // section (even if 'current' is empty), add the last token.
-            if (!current.empty() || inside_quoted || empty_quote)
+            if (!current.empty() || inside_quoted)
                 result.push_back(current);        
         }
         return result;
@@ -97,4 +94,3 @@ namespace boost { namespace program_options {
 
 }}
 #endif
-

test/cmdline_test.cpp

@@ -378,15 +378,6 @@ void test_guessing()
         {0, 0, 0}
     };
     test_cmdline("opt123 opt56 foo,f=", style, test_cases1);
-
-    test_case test_cases2[] = { 
-        {"--fname file --fname2 file2", s_success, "fname: file fname2: file2"},
-        {"--fnam file --fnam file2", s_ambiguous_option, ""},
-        {"--fnam file --fname2 file2", s_ambiguous_option, ""},
-        {"--fname2 file2 --fnam file", s_ambiguous_option, ""},
-        {0, 0, 0} 
-    };
-    test_cmdline("fname fname2", style, test_cases2);
 }
 
 void test_arguments()

test/options_description_test.cpp

@@ -53,17 +53,6 @@ void test_approximation()
     BOOST_CHECK_EQUAL(desc.find("all", true).long_name(), "all");
     BOOST_CHECK_EQUAL(desc.find("all-ch", true).long_name(), "all-chroots");
 
-    options_description desc2;
-    desc2.add_options()
-        ("help", "display this message")
-        ("config", value<string>(), "config file name")
-        ("config-value", value<string>(), "single config value")
-        ;
-
-    BOOST_CHECK_EQUAL(desc2.find("config", true).long_name(), "config");
-    BOOST_CHECK_EQUAL(desc2.find("config-value", true).long_name(), 
-                      "config-value");
-
 
 //    BOOST_CHECK(desc.count_approx("foo") == 1);
 //    set<string> a = desc.approximations("f");

test/parsers_test.cpp

@@ -131,7 +131,7 @@ void test_command_line()
     // Regression test: check that '0' as style is interpreted as 
     // 'default_style'
     vector<option> a4 = 
-        parse_command_line(sizeof(cmdline3_)/sizeof(const char*), cmdline3_, 
+        parse_command_line(sizeof(cmdline3_)/sizeof(const char*), const_cast<char**>(cmdline3_), 
                                                                desc, 0, additional_parser).options;
 
     BOOST_CHECK_EQUAL(a4.size(), 4u);

test/program_options_size_test.py

@@ -21,7 +21,7 @@ void do_it()
       f.write("(\"opt%d\", value<int>())\n")
    f.write(";\n}\n")   
    f.close()
-   os.system(compiler_command + " -c -save-temps -I /home/ghost/Work/Boost/boost-svn program_options_test.cpp")
+   os.system(compiler_command + " -c -save-temps -I /home/ghost/Work/boost-rc program_options_test.cpp")
 
    nm = os.popen("nm -S program_options_test.o")
    for l in nm:
@@ -45,7 +45,7 @@ def run_tests(range, compiler_command):
    print "Avarage: ", (last_size-first_size)/(range[-1]-range[0])
 
 if __name__ == '__main__':
-   for compiler in [ "g++ -Os", "g++ -O3"]:
+   for compiler in [ "g++-3.3 -Os", "g++-3.3 -O3", "g++-3.4 -Os", "g++-3.4 -O3"]:
       print "****", compiler, "****"
       run_tests(range(1, 20), compiler)