From f4a9fa6569722ef530fac995dc66ec8b6a3179ce Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 14 Mar 2016 00:02:42 +0100 Subject: [PATCH] Support incompatible change in Boost 1.60. #3117 --- xs/src/libslic3r/Point.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xs/src/libslic3r/Point.hpp b/xs/src/libslic3r/Point.hpp index af0f59af9..6e057aae3 100644 --- a/xs/src/libslic3r/Point.hpp +++ b/xs/src/libslic3r/Point.hpp @@ -119,6 +119,9 @@ namespace boost { namespace polygon { template <> struct geometry_concept { typedef coordinate_concept type; }; +/* Boost.Polygon already defines a specialization for coordinate_traits as of 1.60: + https://github.com/boostorg/polygon/commit/0ac7230dd1f8f34cb12b86c8bb121ae86d3d9b97 */ +#if BOOST_VERSION < 106000 template <> struct coordinate_traits { typedef coord_t coordinate_type; @@ -128,6 +131,7 @@ namespace boost { namespace polygon { typedef long long coordinate_difference; typedef long double coordinate_distance; }; +#endif template <> struct geometry_concept { typedef point_concept type; };