From 52df451ee33f0b8e642fdddd2a7f150f4a04a219 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 4 May 2016 10:19:17 +0200
Subject: [PATCH] geometry_envelope_test - fix linking/duplicate symbols (ref
 #3415)

---
 test/unit/geometry/geometry_envelope_test.cpp |  3 +--
 test/unit/geometry/geometry_test_helper.cpp   | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/geometry/geometry_test_helper.cpp

diff --git a/test/unit/geometry/geometry_envelope_test.cpp b/test/unit/geometry/geometry_envelope_test.cpp
index 4a8bdc2ee..75049820a 100644
--- a/test/unit/geometry/geometry_envelope_test.cpp
+++ b/test/unit/geometry/geometry_envelope_test.cpp
@@ -1,8 +1,7 @@
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope_impl.hpp>
-//#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry_envelope.hpp>
 
 namespace {
 
diff --git a/test/unit/geometry/geometry_test_helper.cpp b/test/unit/geometry/geometry_test_helper.cpp
new file mode 100644
index 000000000..44bcce596
--- /dev/null
+++ b/test/unit/geometry/geometry_test_helper.cpp
@@ -0,0 +1,15 @@
+#include <mapnik/geometry.hpp>
+#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry_envelope_impl.hpp>
+
+
+namespace mapnik { namespace geometry {
+// instantiate types required by geometry_envelope_test
+template mapnik::box2d<int> envelope(geometry<int> const& geom);
+template mapnik::box2d<float> envelope(geometry<float> const& geom);
+template mapnik::box2d<int> envelope(polygon<int> const& geom);
+template mapnik::box2d<float> envelope(polygon<float> const& geom);
+template mapnik::box2d<int> envelope(geometry_collection<int> const& geom);
+template mapnik::box2d<float> envelope(geometry_collection<float> const& geom);
+
+}}