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

Subject: [Boost-commit] svn:boost r78362 - in branches/release: boost/program_options boost/program_options/detail libs/program_options
From: ghost_at_[hidden]
Date: 2012-05-06 14:13:26

Author: vladimir_prus
Date: 2012-05-06 14:13:25 EDT (Sun, 06 May 2012)
New Revision: 78362
URL: http://svn.boost.org/trac/boost/changeset/78362

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/config_file.hpp |     2 --                                      
   branches/release/boost/program_options/errors.hpp             |     2 +-                                      
   2 files changed, 1 insertions(+), 3 deletions(-)

Modified: branches/release/boost/program_options/detail/config_file.hpp
==============================================================================
--- branches/release/boost/program_options/detail/config_file.hpp	(original)
+++ branches/release/boost/program_options/detail/config_file.hpp	2012-05-06 14:13:25 EDT (Sun, 06 May 2012)
@@ -17,9 +17,7 @@
 #include <boost/program_options/eof_iterator.hpp>
 
 #include <boost/detail/workaround.hpp>
-#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202))
 #include <boost/program_options/detail/convert.hpp>
-#endif
 
 #if BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042))
 #include <istream> // std::getline

Modified: branches/release/boost/program_options/errors.hpp
==============================================================================
--- branches/release/boost/program_options/errors.hpp	(original)
+++ branches/release/boost/program_options/errors.hpp	2012-05-06 14:13:25 EDT (Sun, 06 May 2012)
@@ -41,7 +41,7 @@
     class BOOST_PROGRAM_OPTIONS_DECL too_many_positional_options_error : public error {
     public:
         too_many_positional_options_error() 
-         : error("too many positional arguments have been specified on the command line") 
+         : error("too many positional options have been specified on the command line") 
         {}
     };