Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / point.hpp

diff --git a/boost/gil/point.hpp b/boost/gil/point.hpp
index ffba004..0f40faf 100644 (file)
--- a/boost/gil/point.hpp
+++ b/boost/gil/point.hpp
@@ -9,6 +9,7 @@
 #define BOOST_GIL_POINT_HPP
 
 #include <boost/gil/utilities.hpp>
+#include <boost/gil/detail/std_common_type.hpp>
 
 #include <boost/config.hpp>
 
@@ -165,14 +166,19 @@ point<T> operator-(const point<T>& p1, const point<T>& p2)
 /// \ingroup PointModel
 template <typename T, typename D>
 BOOST_FORCEINLINE
-auto operator/(point<T> const& p, D d) -> point<typename std::common_type<T, D>::type>
+auto operator/(point<T> const& p, D d)
+    -> typename std::enable_if
+    <
+        std::is_arithmetic<D>::value,
+        point<typename detail::std_common_type<T, D>::type>
+    >::type
 {
     static_assert(std::is_arithmetic<D>::value, "denominator is not arithmetic type");
-    using result_type = typename std::common_type<T, D>::type;
+    using result_type = typename detail::std_common_type<T, D>::type;
     if (d < 0 || 0 < d)
     {
-        double const x = p.x / static_cast<double>(d);
-        double const y = p.y / static_cast<double>(d);
+        double const x = static_cast<double>(p.x) / static_cast<double>(d);
+        double const y = static_cast<double>(p.y) / static_cast<double>(d);
         return point<result_type>{
             static_cast<result_type>(iround(x)),
             static_cast<result_type>(iround(y))};
@@ -186,20 +192,30 @@ auto operator/(point<T> const& p, D d) -> point<typename std::common_type<T, D>:
 /// \ingroup PointModel
 template <typename T, typename M>
 BOOST_FORCEINLINE
-auto operator*(point<T> const& p, M m) -> point<typename std::common_type<T, M>::type>
+auto operator*(point<T> const& p, M m)
+    -> typename std::enable_if
+    <
+        std::is_arithmetic<M>::value,
+        point<typename detail::std_common_type<T, M>::type>
+    >::type
 {
     static_assert(std::is_arithmetic<M>::value, "multiplier is not arithmetic type");
-    using result_type = typename std::common_type<T, M>::type;
+    using result_type = typename detail::std_common_type<T, M>::type;
     return point<result_type>{p.x * m, p.y * m};
 }
 
 /// \ingroup PointModel
 template <typename T, typename M>
 BOOST_FORCEINLINE
-auto operator*(M m, point<T> const& p) -> point<typename std::common_type<T, M>::type>
+auto operator*(M m, point<T> const& p)
+    -> typename std::enable_if
+    <
+        std::is_arithmetic<M>::value,
+        point<typename detail::std_common_type<T, M>::type>
+    >::type
 {
     static_assert(std::is_arithmetic<M>::value, "multiplier is not arithmetic type");
-    using result_type = typename std::common_type<T, M>::type;
+    using result_type = typename detail::std_common_type<T, M>::type;
     return point<result_type>{p.x * m, p.y * m};
 }