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

+ fix to compile in c++11/libc++ mode (clang++ 3.3)

Browse source
This commit is contained in:
artemp 2013-01-24 13:32:43 +00:00
parent 6f91aaa77d
commit 225362b3f6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/transform_expression.hpp
View file

@ -71,7 +71,7 @@ struct translate_node
translate_node(expr_node const& tx,
boost::optional<expr_node> const& ty)
: tx_(tx)
, ty_(ty ? *ty : value_null()) {}
, ty_(ty ? expr_node(*ty) : value_null()) {}
};
struct scale_node
@ -82,7 +82,7 @@ struct scale_node
scale_node(expr_node const& sx,
boost::optional<expr_node> const& sy)
: sx_(sx)
, sy_(sy ? *sy : value_null()) {}
, sy_(sy ? expr_node(*sy) : value_null()) {}
};
struct rotate_node
@ -104,8 +104,8 @@ struct rotate_node
boost::optional<expr_node> const& cx,
boost::optional<expr_node> const& cy)
: angle_(angle)
, cx_(cx ? *cx : value_null())
, cy_(cy ? *cy : value_null()) {}
, cx_(cx ? expr_node(*cx) : value_null())
, cy_(cy ? expr_node(*cy) : value_null()) {}
rotate_node(expr_node const& angle,
boost::optional<coords_type> const& center)