diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp index 823991b52..0c939498a 100644 --- a/include/mapnik/value.hpp +++ b/include/mapnik/value.hpp @@ -824,15 +824,24 @@ public: value () noexcept //-- comment out for VC++11 : base_(value_null()) {} - template value(T const& _val_) - : base_(_val_) {} + value(value_integer val) + : base_(val) {} + + value(value_double val) + : base_(val) {} + + value(value_bool val) + : base_(val) {} + + value(value_null val) + : base_(val) {} + + value(value_unicode_string const& val) + : base_(val) {} value (value const& other) : base_(other.base_) {} - value( value && other) noexcept - : base_(std::move(other.base_)) {} - value & operator=( value const& other) { if (this == &other) @@ -841,6 +850,9 @@ public: return *this; } + value( value && other) noexcept + : base_(std::move(other.base_)) {} + bool operator==(value const& other) const { return boost::apply_visitor(impl::equals(),base_,other.base_); diff --git a/plugins/input/postgis/postgis_featureset.cpp b/plugins/input/postgis/postgis_featureset.cpp index c9c336f22..d23c8edba 100644 --- a/plugins/input/postgis/postgis_featureset.cpp +++ b/plugins/input/postgis/postgis_featureset.cpp @@ -107,7 +107,7 @@ feature_ptr postgis_featureset::next() // TODO - extend feature class to know // that its id is also an attribute to avoid // this duplication - feature->put(name,std::move(val)); + feature->put(name,val); ++pos; } else