Merge pull request #1268 from vissarion/fix/constexpr_index

Fix BOOST_GEOMETRY_CONSTEXPR call in index (including support for c++17)
boostorg · Apr 1, 2024 · 38ba463 · 38ba463
2 parents f8e440d + bfa6d4a
commit 38ba463
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/include/boost/geometry/index/detail/rtree/visitors/insert.hpp b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
@@ -328,11 +328,11 @@ class insert
         // Enlarge it in case if it's not bounding geometry type.
         // It's because Points and Segments are compared WRT machine epsilon
         // This ensures that leafs bounds correspond to the stored elements
-        if (BOOST_GEOMETRY_CONSTEXPR ((std::is_same<Element, value_type>::value
+        if BOOST_GEOMETRY_CONSTEXPR ((std::is_same<Element, value_type>::value)
                                     && ! index::detail::is_bounding_geometry
                                             <
                                                 typename indexable_type<translator_type>::type
-                                            >::value)))
+                                            >::value)
         {
             geometry::detail::expand_by_epsilon(m_element_bounds);
         }
@@ -424,15 +424,16 @@ class insert
         // Enlarge bounds of a leaf node.
         // It's because Points and Segments are compared WRT machine epsilon
         // This ensures that leafs' bounds correspond to the stored elements.
-        if (BOOST_GEOMETRY_CONSTEXPR ((std::is_same<Node, leaf>::value
+        if BOOST_GEOMETRY_CONSTEXPR ((std::is_same<Node, leaf>::value)
                                      && ! index::detail::is_bounding_geometry
                                             <
                                                 typename indexable_type<translator_type>::type
-                                            >::value)))
+                                            >::value)
         {
             geometry::detail::expand_by_epsilon(n_box);
             geometry::detail::expand_by_epsilon(additional_nodes[0].first);
         }
+
 #endif
 
         // node is not the root - just add the new node