summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-24 20:33:19 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-24 20:35:17 (GMT)
commit332d60c56dfaa11fdd135088279d15cd5983b3d4 (patch)
treedd77717a4e1732da929d5ff8a0471fa3f005e201 /3rdParty/Boost/src/boost/program_options
parent90c44a10fec26d2a0935b2d62e82b6a5be028373 (diff)
downloadswift-contrib-332d60c56dfaa11fdd135088279d15cd5983b3d4.zip
swift-contrib-332d60c56dfaa11fdd135088279d15cd5983b3d4.tar.bz2
Upgraded Boost to 1.45.0.
Diffstat (limited to '3rdParty/Boost/src/boost/program_options')
-rw-r--r--3rdParty/Boost/src/boost/program_options/detail/cmdline.hpp9
-rw-r--r--3rdParty/Boost/src/boost/program_options/detail/parsers.hpp8
-rw-r--r--3rdParty/Boost/src/boost/program_options/detail/value_semantic.hpp6
-rw-r--r--3rdParty/Boost/src/boost/program_options/errors.hpp15
-rw-r--r--3rdParty/Boost/src/boost/program_options/option.hpp8
-rw-r--r--3rdParty/Boost/src/boost/program_options/options_description.hpp22
-rw-r--r--3rdParty/Boost/src/boost/program_options/parsers.hpp9
-rw-r--r--3rdParty/Boost/src/boost/program_options/positional_options.hpp9
-rw-r--r--3rdParty/Boost/src/boost/program_options/variables_map.hpp9
9 files changed, 70 insertions, 25 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*/) {
diff --git a/3rdParty/Boost/src/boost/program_options/errors.hpp b/3rdParty/Boost/src/boost/program_options/errors.hpp
index 116af58..ff6bc7f 100644
--- a/3rdParty/Boost/src/boost/program_options/errors.hpp
+++ b/3rdParty/Boost/src/boost/program_options/errors.hpp
@@ -13,14 +13,18 @@
#include <stdexcept>
#include <vector>
-
+#if defined(BOOST_MSVC)
+# pragma warning (push)
+# pragma warning (disable:4275) // non dll-interface class 'std::logic_error' used as base for dll-interface class 'boost::program_options::error'
+# pragma warning (disable:4251) // class 'std::vector<_Ty>' needs to have dll-interface to be used by clients of class 'boost::program_options::ambiguous_option'
+#endif
namespace boost { namespace program_options {
/** 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 +82,9 @@ namespace boost { namespace program_options {
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)
{}
@@ -232,5 +236,8 @@ namespace boost { namespace program_options {
};
}}
+#if defined(BOOST_MSVC)
+# pragma warning (pop)
+#endif
#endif
diff --git a/3rdParty/Boost/src/boost/program_options/option.hpp b/3rdParty/Boost/src/boost/program_options/option.hpp
index 557c692..fa6be52 100644
--- a/3rdParty/Boost/src/boost/program_options/option.hpp
+++ b/3rdParty/Boost/src/boost/program_options/option.hpp
@@ -28,10 +28,10 @@ namespace boost { namespace program_options {
, 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)
{}
diff --git a/3rdParty/Boost/src/boost/program_options/options_description.hpp b/3rdParty/Boost/src/boost/program_options/options_description.hpp
index 0486f02..eff1f90 100644
--- a/3rdParty/Boost/src/boost/program_options/options_description.hpp
+++ b/3rdParty/Boost/src/boost/program_options/options_description.hpp
@@ -25,6 +25,12 @@
#include <iosfwd>
+#if defined(BOOST_MSVC)
+# pragma warning (push)
+# pragma warning (disable:4251) // class 'boost::shared_ptr<T>' needs to have dll-interface to be used by clients of class 'boost::program_options::option_description'
+#endif
+
+
/** Boost namespace */
namespace boost {
/** Namespace for the library. */
@@ -65,7 +71,7 @@ namespace program_options {
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 +87,12 @@ namespace program_options {
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 +113,7 @@ namespace program_options {
/// 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 +217,7 @@ namespace program_options {
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,8 +253,12 @@ namespace program_options {
/** 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) {}
};
}}
+#if defined(BOOST_MSVC)
+# pragma warning (pop)
+#endif
+
#endif
diff --git a/3rdParty/Boost/src/boost/program_options/parsers.hpp b/3rdParty/Boost/src/boost/program_options/parsers.hpp
index e2a4467..49fb19c 100644
--- a/3rdParty/Boost/src/boost/program_options/parsers.hpp
+++ b/3rdParty/Boost/src/boost/program_options/parsers.hpp
@@ -17,6 +17,11 @@
#include <vector>
#include <utility>
+#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::basic_parsed_options<wchar_t>'
+#endif
+
namespace boost { namespace program_options {
class options_description;
@@ -31,8 +36,8 @@ namespace boost { namespace program_options {
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.
diff --git a/3rdParty/Boost/src/boost/program_options/positional_options.hpp b/3rdParty/Boost/src/boost/program_options/positional_options.hpp
index 01406e0..ac2a312 100644
--- a/3rdParty/Boost/src/boost/program_options/positional_options.hpp
+++ b/3rdParty/Boost/src/boost/program_options/positional_options.hpp
@@ -11,6 +11,11 @@
#include <vector>
#include <string>
+#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 {
/** Describes positional options.
@@ -61,5 +66,9 @@ namespace boost { namespace program_options {
}}
+#if defined(BOOST_MSVC)
+# pragma warning (pop)
+#endif
+
#endif
diff --git a/3rdParty/Boost/src/boost/program_options/variables_map.hpp b/3rdParty/Boost/src/boost/program_options/variables_map.hpp
index 02c4af2..9621e05 100644
--- a/3rdParty/Boost/src/boost/program_options/variables_map.hpp
+++ b/3rdParty/Boost/src/boost/program_options/variables_map.hpp
@@ -16,6 +16,11 @@
#include <map>
#include <set>
+#if defined(BOOST_MSVC)
+# pragma warning (push)
+# pragma warning (disable:4251) // 'boost::program_options::variable_value::v' : class 'boost::any' needs to have dll-interface to be used by clients of class 'boost::program_options::variable_value
+#endif
+
namespace boost { namespace program_options {
template<class charT>
@@ -53,8 +58,8 @@ namespace boost { namespace program_options {
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,