archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2026-02-01 17:36:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1879 from mapnik/value_bool

Browse Source 
Value bool
This commit is contained in:
Dane Springmeyer 2013-05-31 12:07:58 -07:00
commit f63196849d
1 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
include/mapnik/value.hpp
View File

@ -42,7 +42,6 @@
// stl
#include <string>
#include <cmath>
// uci
#include <unicode/unistr.h>
#include <unicode/ustring.h>
@ -80,26 +79,34 @@ namespace impl {
struct equals
: public boost::static_visitor<bool>
{
template <typename T, typename U>
bool operator() (const T &, const U &) const
{
return false;
}
template <typename T>
bool operator() (T lhs, T rhs) const
{
return lhs == rhs;
}
bool operator() (value_integer lhs, value_double rhs) const
{
return lhs == rhs;
}
bool operator() (value_bool lhs, value_double rhs) const
{
return lhs == rhs;
}
bool operator() (value_double lhs, value_integer rhs) const
{
return (lhs == rhs)? true : false ;
return lhs == rhs;
}
bool operator() (value_bool lhs, value_integer rhs) const
{
return lhs == rhs;
}
bool operator() (value_integer lhs, value_bool rhs) const
{
return lhs == rhs;
}
bool operator() (value_double lhs, value_bool rhs) const
{
return lhs == rhs;
}
bool operator() (value_unicode_string const& lhs,
@ -113,6 +120,18 @@ struct equals
// this changed from false to true - https://github.com/mapnik/mapnik/issues/794
return true;
}
template <typename T>
bool operator() (T lhs, T rhs) const
{
return lhs == rhs;
}
template <typename T, typename U>
bool operator() (T const& lhs, U const& rhs) const
{
return false;
}
};
struct not_equals
@ -135,11 +154,31 @@ struct not_equals
return lhs != rhs;
}
bool operator() (value_bool lhs, value_double rhs) const
{
return lhs != rhs;
}
bool operator() (value_double lhs, value_integer rhs) const
{
return lhs != rhs;
}
bool operator() (value_bool lhs, value_integer rhs) const
{
return lhs != rhs;
}
bool operator() (value_integer lhs, value_bool rhs) const
{
return lhs != rhs;
}
bool operator() (value_double lhs, value_bool rhs) const
{
return lhs != rhs;
}
bool operator() (value_unicode_string const& lhs,
value_unicode_string const& rhs) const
{