Fix vs2015 workarounds #ifdefs to work with non-vc compilers properly.

awulkiew · awulkiew · commit 928603f32ea6 · 2020-11-26T04:12:19.000+01:00
diff --git a/include/boost/geometry/algorithms/area_result.hpp b/include/boost/geometry/algorithms/area_result.hpp
@@ -76,7 +76,7 @@ struct default_area_result
 {};
 
 // Workaround for VS2015
-#if (_MSC_VER < 1910)
+#if defined(_MSC_VER) && (_MSC_VER < 1910)
 template
 <
     typename Geometry,
diff --git a/include/boost/geometry/arithmetic/cross_product.hpp b/include/boost/geometry/arithmetic/cross_product.hpp
@@ -138,7 +138,7 @@ template
         > = 0
 >
 // workaround for VS2015
-#if (_MSC_VER >= 1910)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1910)
 constexpr
 #endif
 inline ResultP cross_product(P1 const& p1, P2 const& p2)
@@ -193,7 +193,7 @@ template
         > = 0
 >
 // workaround for VS2015
-#if (_MSC_VER >= 1910)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1910)
 constexpr
 #endif
 inline P cross_product(P const& p1, P const& p2)
diff --git a/include/boost/geometry/arithmetic/dot_product.hpp b/include/boost/geometry/arithmetic/dot_product.hpp
@@ -75,7 +75,7 @@ struct dot_product_maker<P1, P2, DimensionCount, DimensionCount>
  */
 template <typename Point1, typename Point2>
 // workaround for VS2015
-#if (_MSC_VER >= 1910)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1910)
 constexpr
 #endif
 inline typename select_coordinate_type<Point1, Point2>::type dot_product(
diff --git a/include/boost/geometry/geometries/point.hpp b/include/boost/geometry/geometries/point.hpp
@@ -112,7 +112,7 @@ class point
     /// \constructor_default_no_init
     constexpr point()
 // Workaround for VS2015
-#if (_MSC_VER < 1910)
+#if defined(_MSC_VER) && (_MSC_VER < 1910)
         : m_values{} {}
 #else
         = default;
diff --git a/include/boost/geometry/strategies/comparable_distance_result.hpp b/include/boost/geometry/strategies/comparable_distance_result.hpp
@@ -61,7 +61,7 @@ struct comparable_distance_result<Geometry1, Geometry2, default_strategy, AreGeo
 {};
 
 // Workaround for VS2015
-#if (_MSC_VER < 1910)
+#if defined(_MSC_VER) && (_MSC_VER < 1910)
 template <typename Geometry1, typename Geometry2, typename Strategy>
 struct comparable_distance_result<Geometry1, Geometry2, Strategy, false>
 {
diff --git a/include/boost/geometry/strategies/default_length_result.hpp b/include/boost/geometry/strategies/default_length_result.hpp
@@ -42,7 +42,7 @@ namespace resolve_strategy
 
 
 // Workaround for VS2015
-#if (_MSC_VER < 1910)
+#if defined(_MSC_VER) && (_MSC_VER < 1910)
 template
 <
     typename Geometry,
diff --git a/include/boost/geometry/strategies/distance_result.hpp b/include/boost/geometry/strategies/distance_result.hpp
@@ -69,7 +69,7 @@ struct distance_result<Geometry1, Geometry2, default_strategy, AreGeometries>
 
 
 // Workaround for VS2015
-#if (_MSC_VER < 1910)
+#if defined(_MSC_VER) && (_MSC_VER < 1910)
 template <typename Geometry1, typename Geometry2, typename Strategy>
 struct distance_result<Geometry1, Geometry2, Strategy, false>
 {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ struct default_area_result`
`76`	`76`	`{};`
`77`	`77`
`78`	`78`	`// Workaround for VS2015`
`79`		`-#if (_MSC_VER < 1910)`
	`79`	`+#if defined(_MSC_VER) && (_MSC_VER < 1910)`
`80`	`80`	`template`
`81`	`81`	`<`
`82`	`82`	`typename Geometry,`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ struct comparable_distance_result<Geometry1, Geometry2, default_strategy, AreGeo`
`61`	`61`	`{};`
`62`	`62`
`63`	`63`	`// Workaround for VS2015`
`64`		`-#if (_MSC_VER < 1910)`
	`64`	`+#if defined(_MSC_VER) && (_MSC_VER < 1910)`
`65`	`65`	`template <typename Geometry1, typename Geometry2, typename Strategy>`
`66`	`66`	`struct comparable_distance_result<Geometry1, Geometry2, Strategy, false>`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ namespace resolve_strategy`
`42`	`42`
`43`	`43`
`44`	`44`	`// Workaround for VS2015`
`45`		`-#if (_MSC_VER < 1910)`
	`45`	`+#if defined(_MSC_VER) && (_MSC_VER < 1910)`
`46`	`46`	`template`
`47`	`47`	`<`
`48`	`48`	`typename Geometry,`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ struct distance_result<Geometry1, Geometry2, default_strategy, AreGeometries>`
`69`	`69`
`70`	`70`
`71`	`71`	`// Workaround for VS2015`
`72`		`-#if (_MSC_VER < 1910)`
	`72`	`+#if defined(_MSC_VER) && (_MSC_VER < 1910)`
`73`	`73`	`template <typename Geometry1, typename Geometry2, typename Strategy>`
`74`	`74`	`struct distance_result<Geometry1, Geometry2, Strategy, false>`
`75`	`75`	`{`