Only using earcut if c++11 is available. Changed nth function to spec…

…ify return type
cxfchxy · Feb 28, 2019 · a83762e · a83762e
1 parent 74f06e4
commit a83762e
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/osgEarth/Tessellator.cpp b/src/osgEarth/Tessellator.cpp
@@ -23,7 +23,30 @@
 
 #include <osgEarth/Tessellator>
 
+#ifdef OSGEARTH_CXX11
+
 #include <osgEarth/earcut.hpp>
+namespace mapbox {
+    namespace util {
+        template <>
+        struct nth<0, osg::Vec2> {
+            inline static float get(const osg::Vec2 &t) {
+                return t.x();
+            };
+        };
+
+        template <>
+        struct nth<1, osg::Vec2> {
+            inline static float get(const osg::Vec2 &t) {
+                return t.y();
+            };
+        };
+    }
+}
+
+#define USE_EARCUT
+
+#endif
 
 using namespace osgEarth;
 
@@ -127,26 +150,6 @@ typedef std::vector<TriIndices> TriList;
 }
 
 
-namespace mapbox {
-    namespace util {
-        template <>
-        struct nth<0, osg::Vec2> {
-            inline static auto get(const osg::Vec2 &t) {
-                return t.x();
-            };
-        };
-
-        template <>
-        struct nth<1, osg::Vec2> {
-            inline static auto get(const osg::Vec2 &t) {
-                return t.y();
-            };
-        };
-    }
-}
-
-#define USE_EARCUT
-
 bool
 Tessellator::tessellateGeometry(osg::Geometry &geom)
 {