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

Revert "attempt to workaround other mapnik_value_type->variant bugs"

Browse source 
This reverts commit 7dc1aed9ee.
This commit is contained in:
Dane Springmeyer 2014-09-04 09:21:14 -07:00
parent 58a8f19b16
commit 98c881432a
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/params.hpp
View file

@ -54,10 +54,8 @@ struct value_holder : value_holder_base
template <typename T>
value_holder(T const& obj)
: value_holder_base()
{
*this = static_cast<typename detail::mapnik_value_type<T>::type>(obj);
}
: value_holder_base(typename detail::mapnik_value_type<T>::type(obj))
{}
// move
template <typename T>

6
include/mapnik/symbolizer.hpp
View file

@ -117,10 +117,8 @@ struct strict_value : value_base_type
template <typename T>
strict_value(T const& obj)
: value_base_type()
{
*this = static_cast<typename detail::mapnik_value_type<T>::type>(obj);
}
: value_base_type(typename detail::mapnik_value_type<T>::type(obj))
{}
// move ctor
template <typename T>
strict_value(T && obj) noexcept