From 148783da25c332e8d8c7ab87fc27725d271f0a7e Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 29 Jul 2016 04:51:18 -0700 Subject: [PATCH] Revert "inherit ctor's from geometry_base" - Fixes #3473 (windows compile) - TODO: @artemp get to the bottom of how to inherit from base class in a way that works with boost::variant and across platforms This reverts commit bf99177da78a45cae2370ad7ec6cd8e58b379b99. --- include/mapnik/geometry.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp index c298fa61d..f97e9e6c6 100644 --- a/include/mapnik/geometry.hpp +++ b/include/mapnik/geometry.hpp @@ -148,7 +148,11 @@ struct geometry : geometry_base geometry() : geometry_base() {} // empty - using geometry_base::geometry_base; + + template + geometry(G && geom) + : geometry_base(std::forward(geom)) {} + }; template