Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r66959 - in trunk/boost/program_options: . detail
From: marshall_at_[hidden]
Date: 2010-12-01 13:54:42


Author: marshall
Date: 2010-12-01 13:54:41 EST (Wed, 01 Dec 2010)
New Revision: 66959
URL: http://svn.boost.org/trac/boost/changeset/66959

Log:
Take argv as const; refs #3909
Text files modified:
   trunk/boost/program_options/detail/parsers.hpp | 6 +++---
   trunk/boost/program_options/parsers.hpp | 4 ++--
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/program_options/detail/parsers.hpp
==============================================================================
--- trunk/boost/program_options/detail/parsers.hpp (original)
+++ trunk/boost/program_options/detail/parsers.hpp 2010-12-01 13:54:41 EST (Wed, 01 Dec 2010)
@@ -36,11 +36,11 @@
 
     template<class charT>
     basic_command_line_parser<charT>::
- basic_command_line_parser(int argc, charT* argv[])
+ basic_command_line_parser(int argc, const charT* const 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, charT**>(argv+1, argv+argc+!argc)))
+ to_internal(detail::make_vector<charT, const charT* const*>(argv+1, argv+argc+!argc)))
     {}
 
     
@@ -111,7 +111,7 @@
 
     template<class charT>
     basic_parsed_options<charT>
- parse_command_line(int argc, charT* argv[],
+ parse_command_line(int argc, const charT* const argv[],
                        const options_description& desc,
                        int style,
                        function1<std::pair<std::string, std::string>,

Modified: trunk/boost/program_options/parsers.hpp
==============================================================================
--- trunk/boost/program_options/parsers.hpp (original)
+++ trunk/boost/program_options/parsers.hpp 2010-12-01 13:54:41 EST (Wed, 01 Dec 2010)
@@ -100,7 +100,7 @@
         /** 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, charT* argv[]);
+ basic_command_line_parser(int argc, const charT* const argv[]);
 
         /** Sets options descriptions to use. */
         basic_command_line_parser& options(const options_description& desc);
@@ -144,7 +144,7 @@
      */
     template<class charT>
     basic_parsed_options<charT>
- parse_command_line(int argc, charT* argv[],
+ parse_command_line(int argc, const charT* const argv[],
                        const options_description&,
                        int style = 0,
                        function1<std::pair<std::string, std::string>,


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk