Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-24 20:33:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-24 20:35:17 (GMT) |
| commit | 332d60c56dfaa11fdd135088279d15cd5983b3d4 (patch) | |
| tree | dd77717a4e1732da929d5ff8a0471fa3f005e201 /3rdParty/Boost/src/boost/program_options/detail | |
| parent | 90c44a10fec26d2a0935b2d62e82b6a5be028373 (diff) | |
| download | swift-332d60c56dfaa11fdd135088279d15cd5983b3d4.zip swift-332d60c56dfaa11fdd135088279d15cd5983b3d4.tar.bz2 | |
Upgraded Boost to 1.45.0.
Diffstat (limited to '3rdParty/Boost/src/boost/program_options/detail')
3 files changed, 16 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/program_options/detail/cmdline.hpp b/3rdParty/Boost/src/boost/program_options/detail/cmdline.hpp index 8d60ead..7c43152 100644 --- a/3rdParty/Boost/src/boost/program_options/detail/cmdline.hpp +++ b/3rdParty/Boost/src/boost/program_options/detail/cmdline.hpp @@ -22,6 +22,11 @@ #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: @@ -134,5 +139,9 @@ namespace boost { namespace program_options { namespace detail { }}} +#if defined(BOOST_MSVC) +# pragma warning (pop) +#endif + #endif diff --git a/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp b/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp index ee19207..506cb35 100644 --- a/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp +++ b/3rdParty/Boost/src/boost/program_options/detail/parsers.hpp @@ -29,8 +29,8 @@ namespace boost { namespace program_options { 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 @@ namespace boost { namespace program_options { 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; } diff --git a/3rdParty/Boost/src/boost/program_options/detail/value_semantic.hpp b/3rdParty/Boost/src/boost/program_options/detail/value_semantic.hpp index 464e306..e4b15d7 100644 --- a/3rdParty/Boost/src/boost/program_options/detail/value_semantic.hpp +++ b/3rdParty/Boost/src/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> > 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*/) { |