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/options_description.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/options_description.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/program_options/options_description.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/program_options/options_description.hpp b/3rdParty/Boost/src/boost/program_options/options_description.hpp index 62530b2..32f6990 100644 --- a/3rdParty/Boost/src/boost/program_options/options_description.hpp +++ b/3rdParty/Boost/src/boost/program_options/options_description.hpp @@ -61,8 +61,8 @@ namespace program_options { Alas, derived->base conversion for auto_ptr does not really work, see - http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2000/n1232.pdf - http://std.dkuug.dk/jtc1/sc22/wg21/docs/cwg_defects.html#84 + http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2000/n1232.pdf + http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#84 So, we have to use plain old pointers. Besides, users are not expected to use the constructor directly. @@ -199,6 +199,10 @@ namespace program_options { */ options_description& add(const options_description& desc); + /** Find the maximum width of the option column, including options + in groups. */ + unsigned get_option_column_width() const; + public: /** Returns an object of implementation-defined type suitable for adding options to options_description. The returned object will @@ -229,7 +233,7 @@ namespace program_options { /** Outputs 'desc' to the specified stream, calling 'f' to output each option_description element. */ - void print(std::ostream& os) const; + void print(std::ostream& os, unsigned width = 0) const; private: typedef std::map<std::string, int>::const_iterator name2index_iterator; |