External/cxxopts
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14 from yazevnul/master

Browse Source 
Fix Clang -Wsign-conversion and -Wshorten-64-to-32 warnings.
This commit is contained in:
jarro2783 2015-05-11 16:34:50 +10:00
commit 8844335d40
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/cxxopts.hpp
View File

@ -25,6 +25,11 @@ THE SOFTWARE.
#ifndef CXX_OPTS_HPP #ifndef CXX_OPTS_HPP
#define CXX_OPTS_HPP #define CXX_OPTS_HPP
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
#include <exception> #include <exception>
#include <iostream> #include <iostream>
#include <map> #include <map>
@ -54,7 +59,7 @@ namespace cxxopts
return icu::UnicodeString::fromUTF8(s); return icu::UnicodeString::fromUTF8(s);
} }
class UnicodeStringIterator : public class UnicodeStringIterator : public
std::iterator<std::forward_iterator_tag, int32_t> std::iterator<std::forward_iterator_tag, int32_t>
{ {
public: public:
@ -196,7 +201,7 @@ namespace cxxopts
inline inline
String& String&
stringAppend(String& s, int n, char c) stringAppend(String& s, size_t n, char c)
{ {
return s.append(n, c); return s.append(n, c);
} }
@ -244,7 +249,7 @@ namespace cxxopts
virtual std::string virtual std::string
get_default_value() const = 0; get_default_value() const = 0;
virtual std::string virtual std::string
get_implicit_value() const = 0; get_implicit_value() const = 0;
virtual std::shared_ptr<Value> virtual std::shared_ptr<Value>
@ -410,7 +415,7 @@ namespace cxxopts
//so that we can write --long=yes explicitly //so that we can write --long=yes explicitly
value = true; value = true;
} }
inline inline
void void
parse_value(const std::string& text, std::string& value) parse_value(const std::string& text, std::string& value)
@ -452,7 +457,7 @@ namespace cxxopts
{ {
parse_value(m_implicit_value, *m_store); parse_value(m_implicit_value, *m_store);
} }
else else
{ {
parse_value(text, *m_store); parse_value(text, *m_store);
} }
@ -484,14 +489,14 @@ namespace cxxopts
virtual std::shared_ptr<Value> virtual std::shared_ptr<Value>
default_value(const std::string& value){ default_value(const std::string& value){
m_default = true; m_default = true;
m_default_value = value; m_default_value = value;
return shared_from_this(); return shared_from_this();
} }
virtual std::shared_ptr<Value> virtual std::shared_ptr<Value>
implicit_value(const std::string& value){ implicit_value(const std::string& value){
m_implicit = true; m_implicit = true;
m_implicit_value = value; m_implicit_value = value;
return shared_from_this(); return shared_from_this();
} }
@ -846,8 +851,8 @@ namespace cxxopts
format_description format_description
( (
const HelpOptionDetails& o, const HelpOptionDetails& o,
int start, size_t start,
int width size_t width
) )
{ {
auto desc = o.desc; auto desc = o.desc;
@ -863,7 +868,7 @@ namespace cxxopts
auto startLine = current; auto startLine = current;
auto lastSpace = current; auto lastSpace = current;
int size = 0; auto size = size_t{};
while (current != std::end(desc)) while (current != std::end(desc))
{ {
@ -932,7 +937,7 @@ OptionAdder::operator()
const auto& s = result[2]; const auto& s = result[2];
const auto& l = result[3]; const auto& l = result[3];
m_options.add_option(m_group, s.str(), l.str(), desc, value, m_options.add_option(m_group, s.str(), l.str(), desc, value,
std::move(arg_help)); std::move(arg_help));
return *this; return *this;
@ -969,8 +974,8 @@ Options::checked_parse_arg
{ {
throw missing_argument_exception(name); throw missing_argument_exception(name);
} }
} }
else else
{ {
if (argv[current + 1][0] == '-' && value->value().has_implicit()) if (argv[current + 1][0] == '-' && value->value().has_implicit())
{ {
@ -1228,7 +1233,7 @@ Options::help_one_group(const std::string& g) const
longest = std::min(longest, static_cast<size_t>(OPTION_LONGEST)); longest = std::min(longest, static_cast<size_t>(OPTION_LONGEST));
//widest allowed description //widest allowed description
int allowed = 76 - longest - OPTION_DESC_GAP; auto allowed = size_t{76} - longest - OPTION_DESC_GAP;
auto fiter = format.begin(); auto fiter = format.begin();
for (const auto& o : group->second.options) for (const auto& o : group->second.options)
@ -1243,7 +1248,7 @@ Options::help_one_group(const std::string& g) const
} }
else else
{ {
result += toLocalString(std::string(longest + OPTION_DESC_GAP - result += toLocalString(std::string(longest + OPTION_DESC_GAP -
stringLength(fiter->first), stringLength(fiter->first),
' ')); ' '));
} }
@ -1299,4 +1304,9 @@ Options::group_help(const std::string& group) const
} }
} }
#if defined(__GNU__)
#pragma GCC diagnostic pop
#endif
#endif //CXX_OPTS_HPP #endif //CXX_OPTS_HPP