Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:35:17 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:35:17 (GMT) |
| commit | a135c6ff4dcded5661a2321512960b14cf8c15c8 (patch) | |
| tree | b0017ecfe702304f592b9d4e8b943784cff26fb2 /3rdParty/Boost/src/boost/program_options/detail | |
| parent | 02d6188ab335e6c62b8341b84579d9549d215118 (diff) | |
| download | swift-contrib-a135c6ff4dcded5661a2321512960b14cf8c15c8.zip swift-contrib-a135c6ff4dcded5661a2321512960b14cf8c15c8.tar.bz2 | |
Updated Boost to 1.46.1.
This should hopefuily fix a hang on shutdown on Mac OS X.
Resolves: #782
Release-Notes: Fixed a potential hang on shutdown on Mac OS X.
Diffstat (limited to '3rdParty/Boost/src/boost/program_options/detail')
| -rw-r--r-- | 3rdParty/Boost/src/boost/program_options/detail/parsers.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp b/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp index 506cb35..a1124b2 100644 --- a/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp +++ b/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp @@ -36,11 +36,11 @@ namespace boost { namespace program_options { 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 @@ namespace boost { namespace program_options { 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>, |