[Boost-commit] svn:boost r63911 - in branches/release: boost/program_options boost/program_options/detail libs/program_options libs/program_options/doc

Subject: [Boost-commit] svn:boost r63911 - in branches/release: boost/program_options boost/program_options/detail libs/program_options libs/program_options/doc
From: ghost_at_[hidden]
Date: 2010-07-12 03:14:17

Author: vladimir_prus
Date: 2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
New Revision: 63911
URL: http://svn.boost.org/trac/boost/changeset/63911

Log:
Merge from trunk
Properties modified: 
   branches/release/boost/program_options/   (props changed)
   branches/release/libs/program_options/   (props changed)
Text files modified: 
   branches/release/boost/program_options/detail/parsers.hpp        |     8 ++++----                                
   branches/release/boost/program_options/detail/value_semantic.hpp |     6 +++---                                  
   branches/release/boost/program_options/errors.hpp                |     6 +++---                                  
   branches/release/boost/program_options/option.hpp                |     8 ++++----                                
   branches/release/boost/program_options/options_description.hpp   |    12 ++++++------                            
   branches/release/boost/program_options/parsers.hpp               |     4 ++--                                    
   branches/release/boost/program_options/variables_map.hpp         |     4 ++--                                    
   branches/release/libs/program_options/doc/howto.xml              |     4 ++--                                    
   8 files changed, 26 insertions(+), 26 deletions(-)

Modified: branches/release/boost/program_options/detail/parsers.hpp
==============================================================================
--- branches/release/boost/program_options/detail/parsers.hpp	(original)
+++ branches/release/boost/program_options/detail/parsers.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -29,8 +29,8 @@
     template<class charT>
     basic_command_line_parser<charT>::
     basic_command_line_parser(const std::vector<
-                              std::basic_string<charT> >& args)
-       : detail::cmdline(to_internal(args))
+                              std::basic_string<charT> >& xargs)
+       : detail::cmdline(to_internal(xargs))
     {}
 
 
@@ -64,9 +64,9 @@
 
     template<class charT>
     basic_command_line_parser<charT>& 
-    basic_command_line_parser<charT>::style(int style)
+    basic_command_line_parser<charT>::style(int xstyle)
     {
-        detail::cmdline::style(style);
+        detail::cmdline::style(xstyle);
         return *this;
     }
 

Modified: branches/release/boost/program_options/detail/value_semantic.hpp
==============================================================================
--- branches/release/boost/program_options/detail/value_semantic.hpp	(original)
+++ branches/release/boost/program_options/detail/value_semantic.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -143,9 +143,9 @@
                    a validator for class T, we use it even
                    when parsing vector<T>.  */
                 boost::any a;
-                std::vector<std::basic_string<charT> > v;
-                v.push_back(s[i]);
-                validate(a, v, (T*)0, 0);                
+                std::vector<std::basic_string<charT> > cv;
+                cv.push_back(s[i]);
+                validate(a, cv, (T*)0, 0);                
                 tv->push_back(boost::any_cast<T>(a));
             }
             catch(const bad_lexical_cast& /*e*/) {

Modified: branches/release/boost/program_options/errors.hpp
==============================================================================
--- branches/release/boost/program_options/errors.hpp	(original)
+++ branches/release/boost/program_options/errors.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -20,7 +20,7 @@
     /** Base class for all errors in the library. */
     class BOOST_PROGRAM_OPTIONS_DECL error : public std::logic_error {
     public:
-        error(const std::string& what) : std::logic_error(what) {}
+        error(const std::string& xwhat) : std::logic_error(xwhat) {}
     };
 
     class BOOST_PROGRAM_OPTIONS_DECL invalid_syntax : public error {
@@ -78,9 +78,9 @@
     class BOOST_PROGRAM_OPTIONS_DECL ambiguous_option : public error {
     public:
         ambiguous_option(const std::string& name, 
-                         const std::vector<std::string>& alternatives)
+                         const std::vector<std::string>& xalternatives)
         : error(std::string("ambiguous option ").append(name))
-        , m_alternatives(alternatives)
+        , m_alternatives(xalternatives)
         , m_option_name(name)
         {}
 

Modified: branches/release/boost/program_options/option.hpp
==============================================================================
--- branches/release/boost/program_options/option.hpp	(original)
+++ branches/release/boost/program_options/option.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -28,10 +28,10 @@
         , unregistered(false) 
         , case_insensitive(false)
         {}
-        basic_option(const std::string& string_key, 
-               const std::vector< std::string> &value)
-        : string_key(string_key)
-        , value(value)
+        basic_option(const std::string& xstring_key, 
+               const std::vector< std::string> &xvalue)
+        : string_key(xstring_key)
+        , value(xvalue)
         , unregistered(false)
         , case_insensitive(false)
         {}

Modified: branches/release/boost/program_options/options_description.hpp
==============================================================================
--- branches/release/boost/program_options/options_description.hpp	(original)
+++ branches/release/boost/program_options/options_description.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -65,7 +65,7 @@
             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 -- long name.
+            after -- short name.
         */
         option_description(const char* name,
                            const value_semantic* s);
@@ -81,12 +81,12 @@
         enum match_result { no_match, full_match, approximate_match };
 
         /** Given 'option', specified in the input source,
-            return 'true' is 'option' specifies *this.
+            returns 'true' if 'option' specifies *this.
         */
         match_result match(const std::string& option, bool approx,
                            bool long_ignore_case, bool short_ignore_case) const;
 
-        /** Return the key that should identify the option, in
+        /** Returns 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.
@@ -107,7 +107,7 @@
         /// Returns the option name, formatted suitably for usage message. 
         std::string format_name() const;
 
-        /** Return the parameter name and properties, formatted suitably for
+        /** Returns the parameter name and properties, formatted suitably for
             usage message. */
         std::string format_parameter() const;
 
@@ -211,7 +211,7 @@
         friend BOOST_PROGRAM_OPTIONS_DECL std::ostream& operator<<(std::ostream& os, 
                                              const options_description& desc);
 
-        /** Output 'desc' to the specified stream, calling 'f' to output each
+        /** Outputs 'desc' to the specified stream, calling 'f' to output each
             option_description element. */
         void print(std::ostream& os) const;
 
@@ -247,7 +247,7 @@
     /** 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& what) : error(what) {}
+        duplicate_option_error(const std::string& xwhat) : error(xwhat) {}
     };
 }}
 

Modified: branches/release/boost/program_options/parsers.hpp
==============================================================================
--- branches/release/boost/program_options/parsers.hpp	(original)
+++ branches/release/boost/program_options/parsers.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -31,8 +31,8 @@
     template<class charT>
     class basic_parsed_options {
     public:
-        explicit basic_parsed_options(const options_description* description) 
-        : description(description) {}
+        explicit basic_parsed_options(const options_description* xdescription) 
+        : description(xdescription) {}
         /** Options found in the source. */
         std::vector< basic_option<charT> > options;
         /** Options description that was used for parsing. 

Modified: branches/release/boost/program_options/variables_map.hpp
==============================================================================
--- branches/release/boost/program_options/variables_map.hpp	(original)
+++ branches/release/boost/program_options/variables_map.hpp	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -53,8 +53,8 @@
     class BOOST_PROGRAM_OPTIONS_DECL variable_value {
     public:
         variable_value() : m_defaulted(false) {}
-        variable_value(const boost::any& v, bool defaulted) 
-        : v(v), m_defaulted(defaulted) 
+        variable_value(const boost::any& xv, bool xdefaulted) 
+        : v(xv), m_defaulted(xdefaulted) 
         {}
 
         /** If stored value if of type T, returns that value. Otherwise,

Modified: branches/release/libs/program_options/doc/howto.xml
==============================================================================
--- branches/release/libs/program_options/doc/howto.xml	(original)
+++ branches/release/libs/program_options/doc/howto.xml	2010-07-12 03:14:14 EDT (Mon, 12 Jul 2010)
@@ -107,7 +107,7 @@
      // Load the file and tokenize it
      ifstream ifs(vm["response-file"].as<string>().c_str());
      if (!ifs) {
-         cout << "Could no open the response file\n";
+         cout << "Could not open the response file\n";
          return 1;
      }
      // Read the whole file into a string
@@ -146,7 +146,7 @@
 vector&lt;string&gt; args = split_winmain(lpCmdLine);
 store(command_line_parser(args).options(desc).run(), vm);
 </programlisting>      
-      The function is an overload for <code>wchar_t</code> strings, so can
+      The <code>split_winmain</code> function is overloaded for <code>wchar_t</code> strings, so can
       also be used in Unicode applications.
     </para>