Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/program_options/errors.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/program_options/errors.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/program_options/errors.hpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/3rdParty/Boost/src/boost/program_options/errors.hpp b/3rdParty/Boost/src/boost/program_options/errors.hpp index addb8d6..f31defb 100644 --- a/3rdParty/Boost/src/boost/program_options/errors.hpp +++ b/3rdParty/Boost/src/boost/program_options/errors.hpp @@ -25,7 +25,8 @@ namespace boost { namespace program_options { inline std::string strip_prefixes(const std::string& text) { - return text.substr(text.find_last_of("-/") + 1); + // "--foo-bar" -> "foo-bar" + return text.substr(text.find_first_not_of("-/")); } /** Base class for all errors in the library. */ @@ -104,13 +105,13 @@ namespace boost { namespace program_options { std::map<std::string, string_pair > m_substitution_defaults; public: - /** template with placeholders */ - std::string m_error_template; + /** template with placeholders */ + std::string m_error_template; - error_with_option_name(const std::string& template_, - const std::string& option_name = "", - const std::string& original_token = "", - int option_style = 0); + error_with_option_name(const std::string& template_, + const std::string& option_name = "", + const std::string& original_token = "", + int option_style = 0); /** gcc says that throw specification on dtor is loosened * without this line @@ -250,7 +251,7 @@ namespace boost { namespace program_options { } /** Does NOT set option name, because no option name makes sense */ - virtual void set_option_name(const std::string& option_name){} + virtual void set_option_name(const std::string&) {} ~error_with_no_option_name() throw() {} }; |