multimap.ops

Author: vinay-deshmukh

libcxx/include/__tree

@@ -2471,14 +2471,15 @@ __tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) const {
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __result = static_cast<__end_node_pointer>(__rt);
-      __rt     = static_cast<__node_pointer>(__rt->__left_);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
+      __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
-      return _Pp(
-          __lower_bound_multi(__k, static_cast<__node_pointer>(__rt->__left_), static_cast<__end_node_pointer>(__rt)),
-          __upper_bound_multi(__k, static_cast<__node_pointer>(__rt->__right_), __result));
+      return _Pp(__lower_bound_multi(__k,
+                                     std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_),
+                                     std::__static_fancy_pointer_cast<__end_node_pointer>(__rt)),
+                 __upper_bound_multi(__k, std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_), __result));
   }
   return _Pp(const_iterator(__result), const_iterator(__result));
 }

libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp

@@ -19,13 +19,18 @@
 #include <map>
 #include <utility>
 
+#include "test_macros.h"
+
 struct Comp {
   using is_transparent = void;
 
+  TEST_CONSTEXPR_CXX26
   bool operator()(const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) const { return lhs < rhs; }
 
+  TEST_CONSTEXPR_CXX26
   bool operator()(const std::pair<int, int>& lhs, int rhs) const { return lhs.first < rhs; }
 
+  TEST_CONSTEXPR_CXX26
   bool operator()(int lhs, const std::pair<int, int>& rhs) const { return lhs < rhs.first; }
 };
 

libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp

@@ -24,13 +24,18 @@
 #include <map>
 #include <utility>
 
+#include "test_macros.h"
+
 struct Comp {
   using is_transparent = void;
 
+  TEST_CONSTEXPR_CXX26
   bool operator()(const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) const { return lhs < rhs; }
 
+  TEST_CONSTEXPR_CXX26
   bool operator()(const std::pair<int, int>& lhs, int rhs) const { return lhs.first < rhs; }
 
+  TEST_CONSTEXPR_CXX26
   bool operator()(int lhs, const std::pair<int, int>& rhs) const { return lhs < rhs.first; }
 };
 

libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp

@@ -23,7 +23,7 @@
 #include "is_transparent.h"
 
 template <class Iter>
-bool iter_in_range(Iter first, Iter last, Iter to_find) {
+TEST_CONSTEXPR_CXX26 bool iter_in_range(Iter first, Iter last, Iter to_find) {
   for (; first != last; ++first) {
     if (first == to_find)
       return true;