Fix Clang -Wsign-conversion and -Wshorten-64-to-32 warnings.

This commit is contained in:
Kostya Bazhanov 2015-04-18 21:50:12 +03:00
parent 2e9aab5cd0
commit 9c59bb25ff

View File

@ -196,7 +196,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);
} }
@ -846,8 +846,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 +863,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))
{ {
@ -1228,7 +1228,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)