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

Merge branch 'master' into enable-appveyor

Browse source
This commit is contained in:
bergwerkgis 2015-09-21 16:01:36 +00:00
commit 38498fdbe7
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/mapnik/value.hpp
View file

@ -76,32 +76,32 @@ struct equals
{
bool operator() (value_integer lhs, value_double rhs) const
{
return lhs == rhs;
return lhs == static_cast<value_integer>(rhs);
}
bool operator() (value_bool lhs, value_double rhs) const
{
return lhs == rhs;
return lhs == static_cast<value_bool>(rhs);
}
bool operator() (value_double lhs, value_integer rhs) const
{
return lhs == rhs;
return lhs == static_cast<value_double>(rhs);
}
bool operator() (value_bool lhs, value_integer rhs) const
{
return lhs == rhs;
return lhs == static_cast<value_bool>(rhs);
}
bool operator() (value_integer lhs, value_bool rhs) const
{
return lhs == rhs;
return lhs == static_cast<value_integer>(rhs);
}
bool operator() (value_double lhs, value_bool rhs) const
{
return lhs == rhs;
return lhs == static_cast<value_double>(rhs);
}
bool operator() (value_unicode_string const& lhs,
@ -145,27 +145,27 @@ struct not_equals
bool operator() (value_bool lhs, value_double rhs) const
{
return lhs != rhs;
return lhs != static_cast<value_bool>(rhs);
}
bool operator() (value_double lhs, value_integer rhs) const
{
return lhs != rhs;
return lhs != static_cast<value_double>(rhs);
}
bool operator() (value_bool lhs, value_integer rhs) const
{
return lhs != rhs;
return lhs != static_cast<value_bool>(rhs);
}
bool operator() (value_integer lhs, value_bool rhs) const
{
return lhs != rhs;
return lhs != static_cast<value_integer>(rhs);
}
bool operator() (value_double lhs, value_bool rhs) const
{
return lhs != rhs;
return lhs != static_cast<value_double>(rhs);
}
bool operator() (value_unicode_string const& lhs,