From 1e51db16b5eba27c9a7a36a74561cfa19e220223 Mon Sep 17 00:00:00 2001 From: Jarryd Beck Date: Tue, 29 Aug 2017 18:20:28 +1000 Subject: Minor tweaks --- include/cxxopts.hpp | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/include/cxxopts.hpp b/include/cxxopts.hpp index c0e97f5..ff17ec4 100644 --- a/include/cxxopts.hpp +++ b/include/cxxopts.hpp @@ -243,13 +243,16 @@ namespace cxxopts namespace cxxopts { + namespace + { #ifdef _WIN32 - const std::string LQUOTE("\'"); - const std::string RQUOTE("\'"); + const std::string LQUOTE("\'"); + const std::string RQUOTE("\'"); #else - const std::string LQUOTE("‘"); - const std::string RQUOTE("’"); + const std::string LQUOTE("‘"); + const std::string RQUOTE("’"); #endif + } class Value : public std::enable_shared_from_this { @@ -327,7 +330,7 @@ namespace cxxopts { public: option_exists_error(const std::string& option) - : OptionSpecException(u8"Option " + LQUOTE + option + RQUOTE + u8" already exists") + : OptionSpecException(u8"Option " + LQUOTE + option + RQUOTE + u8" already exists") { } }; @@ -336,7 +339,7 @@ namespace cxxopts { public: invalid_option_format_error(const std::string& format) - : OptionSpecException(u8"Invalid option format " + LQUOTE + format + RQUOTE) + : OptionSpecException(u8"Invalid option format " + LQUOTE + format + RQUOTE) { } }; @@ -345,7 +348,7 @@ namespace cxxopts { public: option_not_exists_exception(const std::string& option) - : OptionParseException(u8"Option " + LQUOTE + option + RQUOTE + u8" does not exist") + : OptionParseException(u8"Option " + LQUOTE + option + RQUOTE + u8" does not exist") { } }; @@ -354,7 +357,9 @@ namespace cxxopts { public: missing_argument_exception(const std::string& option) - : OptionParseException(u8"Option " + LQUOTE + option + RQUOTE + u8" is missing an argument") + : OptionParseException( + u8"Option " + LQUOTE + option + RQUOTE + u8" is missing an argument" + ) { } }; @@ -363,7 +368,9 @@ namespace cxxopts { public: option_requires_argument_exception(const std::string& option) - : OptionParseException(u8"Option " + LQUOTE + option + RQUOTE + u8" requires an argument") + : OptionParseException( + u8"Option " + LQUOTE + option + RQUOTE + u8" requires an argument" + ) { } }; @@ -376,9 +383,11 @@ namespace cxxopts const std::string& option, const std::string& arg ) - : OptionParseException( - u8"Option " + LQUOTE + option + RQUOTE + u8" does not take an argument, but argument" - + LQUOTE + arg + RQUOTE + " given") + : OptionParseException( + u8"Option " + LQUOTE + option + RQUOTE + + u8" does not take an argument, but argument" + + LQUOTE + arg + RQUOTE + " given" + ) { } }; @@ -387,7 +396,7 @@ namespace cxxopts { public: option_not_present_exception(const std::string& option) - : OptionParseException(u8"Option " + LQUOTE + option + RQUOTE + u8" not present") + : OptionParseException(u8"Option " + LQUOTE + option + RQUOTE + u8" not present") { } }; @@ -399,9 +408,9 @@ namespace cxxopts ( const std::string& arg ) - : OptionParseException( - u8"Argument " + LQUOTE + arg + RQUOTE + u8" failed to parse" - ) + : OptionParseException( + u8"Argument " + LQUOTE + arg + RQUOTE + u8" failed to parse" + ) { } }; @@ -410,10 +419,9 @@ namespace cxxopts { public: option_required_exception(const std::string& option) - : OptionParseException - ( - u8"Option " + LQUOTE + option + RQUOTE + u8" is required but not present" - ) + : OptionParseException( + u8"Option " + LQUOTE + option + RQUOTE + u8" is required but not present" + ) { } }; -- cgit v1.2.3