[gcc4.9] Make geometry.hpp GCC4.9 compatible

2 files changed, 25 insertions, 16 deletions

diff --git a/src/3rd_party/geometry.hpp/include/mapbox/geometry/geometry.hpp b/src/3rd_party/geometry.hpp/include/mapbox/geometry/geometry.hpp
index a3970bf89b..72e470084d 100644
--- a/src/3rd_party/geometry.hpp/include/mapbox/geometry/geometry.hpp
+++ b/src/3rd_party/geometry.hpp/include/mapbox/geometry/geometry.hpp
@@ -37,7 +37,9 @@ struct geometry : geometry_base<T>
      * The default constructor would create a point geometry with default-constructed coordinates;
      * i.e. (0, 0). Since this is not particularly useful, and could hide bugs, it is disabled.
      */
+#if !defined(__GNUC__) || __GNUC__ >= 5
     geometry() = delete;
+#endif
 };
 
 template <typename T, template <typename...> class Cont>
diff --git a/src/3rd_party/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp b/src/3rd_party/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp
index 3940e5b52c..ca7586f486 100644
--- a/src/3rd_party/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp
+++ b/src/3rd_party/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp
@@ -1,58 +1,65 @@
 #pragma once
 
+// GCC 4.9 compatibility
+#if !defined(__GNUC__) || __GNUC__ >= 5
+#define GEOMETRYHPP_CONSTEXPR constexpr
+#else
+#define GEOMETRYHPP_CONSTEXPR inline
+#endif
+
 namespace mapbox {
 namespace geometry {
 
 template <typename T>
-constexpr point<T> operator+(point<T> const& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator+(point<T> const& lhs, point<T> const& rhs)
 {
     return point<T>(lhs.x + rhs.x, lhs.y + rhs.y);
 }
 
 template <typename T>
-constexpr point<T> operator+(point<T> const& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator+(point<T> const& lhs, T const& rhs)
 {
     return point<T>(lhs.x + rhs, lhs.y + rhs);
 }
 
 template <typename T>
-constexpr point<T> operator-(point<T> const& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator-(point<T> const& lhs, point<T> const& rhs)
 {
     return point<T>(lhs.x - rhs.x, lhs.y - rhs.y);
 }
 
 template <typename T>
-constexpr point<T> operator-(point<T> const& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator-(point<T> const& lhs, T const& rhs)
 {
     return point<T>(lhs.x - rhs, lhs.y - rhs);
 }
 
 template <typename T>
-constexpr point<T> operator*(point<T> const& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator*(point<T> const& lhs, point<T> const& rhs)
 {
     return point<T>(lhs.x * rhs.x, lhs.y * rhs.y);
 }
 
 template <typename T>
-constexpr point<T> operator*(point<T> const& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator*(point<T> const& lhs, T const& rhs)
 {
     return point<T>(lhs.x * rhs, lhs.y * rhs);
 }
 
 template <typename T>
-constexpr point<T> operator/(point<T> const& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator/(point<T> const& lhs, point<T> const& rhs)
 {
     return point<T>(lhs.x / rhs.x, lhs.y / rhs.y);
 }
 
 template <typename T>
-constexpr point<T> operator/(point<T> const& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T> operator/(point<T> const& lhs, T const& rhs)
 {
     return point<T>(lhs.x / rhs, lhs.y / rhs);
 }
 
 template <typename T>
-constexpr point<T>& operator+=(point<T>& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator+=(point<T>& lhs, point<T> const& rhs)
 {
     lhs.x += rhs.x;
     lhs.y += rhs.y;
@@ -60,7 +67,7 @@ constexpr point<T>& operator+=(point<T>& lhs, point<T> const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator+=(point<T>& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator+=(point<T>& lhs, T const& rhs)
 {
     lhs.x += rhs;
     lhs.y += rhs;
@@ -68,7 +75,7 @@ constexpr point<T>& operator+=(point<T>& lhs, T const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator-=(point<T>& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator-=(point<T>& lhs, point<T> const& rhs)
 {
     lhs.x -= rhs.x;
     lhs.y -= rhs.y;
@@ -76,7 +83,7 @@ constexpr point<T>& operator-=(point<T>& lhs, point<T> const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator-=(point<T>& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator-=(point<T>& lhs, T const& rhs)
 {
     lhs.x -= rhs;
     lhs.y -= rhs;
@@ -84,7 +91,7 @@ constexpr point<T>& operator-=(point<T>& lhs, T const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator*=(point<T>& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator*=(point<T>& lhs, point<T> const& rhs)
 {
     lhs.x *= rhs.x;
     lhs.y *= rhs.y;
@@ -92,7 +99,7 @@ constexpr point<T>& operator*=(point<T>& lhs, point<T> const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator*=(point<T>& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator*=(point<T>& lhs, T const& rhs)
 {
     lhs.x *= rhs;
     lhs.y *= rhs;
@@ -100,7 +107,7 @@ constexpr point<T>& operator*=(point<T>& lhs, T const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator/=(point<T>& lhs, point<T> const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator/=(point<T>& lhs, point<T> const& rhs)
 {
     lhs.x /= rhs.x;
     lhs.y /= rhs.y;
@@ -108,7 +115,7 @@ constexpr point<T>& operator/=(point<T>& lhs, point<T> const& rhs)
 }
 
 template <typename T>
-constexpr point<T>& operator/=(point<T>& lhs, T const& rhs)
+GEOMETRYHPP_CONSTEXPR point<T>& operator/=(point<T>& lhs, T const& rhs)
 {
     lhs.x /= rhs;
     lhs.y /= rhs;