sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid clang++ implicit conversion warnings (-Wconversion)

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-02 13:50:05 -08:00
parent c51793c7e4
commit b1eaf2f869
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/value.hpp
View file

@ -48,10 +48,10 @@ namespace mapnik {
inline void to_utf8(UnicodeString const& input, std::string & target) inline void to_utf8(UnicodeString const& input, std::string & target)
{ {
if (input.length() == 0) return; if (input.isEmpty()) return;
const int BUF_SIZE = 256; const int BUF_SIZE = 256;
char buf [BUF_SIZE]; char buf [BUF_SIZE];
int len; int len;
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
@ -61,11 +61,11 @@ inline void to_utf8(UnicodeString const& input, std::string & target)
boost::scoped_array<char> buf_ptr(new char [len+1]); boost::scoped_array<char> buf_ptr(new char [len+1]);
err = U_ZERO_ERROR; err = U_ZERO_ERROR;
u_strToUTF8(buf_ptr.get() , len + 1, &len, input.getBuffer(), input.length(), &err); u_strToUTF8(buf_ptr.get() , len + 1, &len, input.getBuffer(), input.length(), &err);
target.assign(buf_ptr.get() , len); target.assign(buf_ptr.get() , static_cast<std::size_t>(len));
} }
else else
{ {
target.assign(buf, len); target.assign(buf, static_cast<std::size_t>(len));
} }
} }
@ -497,6 +497,8 @@ struct mult : public boost::static_visitor<V>
value_type operator() (value_bool lhs, value_bool rhs) const value_type operator() (value_bool lhs, value_bool rhs) const
{ {
boost::ignore_unused_variable_warning(lhs);
boost::ignore_unused_variable_warning(rhs);
return value_integer(0); return value_integer(0);
} }
}; };
@ -787,12 +789,12 @@ struct to_int : public boost::static_visitor<value_integer>
value_integer operator() (value_double val) const value_integer operator() (value_double val) const
{ {
return rint(val); return static_cast<value_integer>(rint(val));
} }
value_integer operator() (value_bool val) const value_integer operator() (value_bool val) const
{ {
return static_cast<int>(val); return static_cast<value_integer>(val);
} }
value_integer operator() (std::string const& val) const value_integer operator() (std::string const& val) const