CI

Author: huixie90

libcxx/include/__flat_set/flat_set.h

@@ -54,9 +54,10 @@
 #include <__type_traits/container_traits.h>
 #include <__type_traits/invoke.h>
 #include <__type_traits/is_allocator.h>
+#include <__type_traits/is_const.h>
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/is_same.h>
-#include "__type_traits/remove_reference.h"
+#include <__type_traits/remove_reference.h>
 #include <__utility/as_const.h>
 #include <__utility/exception_guard.h>
 #include <__utility/move.h>
@@ -666,7 +667,7 @@ class flat_set {
 
   template <class _Self, class _Kp>
   _LIBCPP_HIDE_FROM_ABI static auto __equal_range_impl(_Self&& __self, const _Kp& __key) {
-    using __iter = _If<__is_const(__libcpp_remove_reference_t<_Self>), const_iterator, iterator>;
+    using __iter = _If<is_const_v<__libcpp_remove_reference_t<_Self>>, const_iterator, iterator>;
     auto __it    = ranges::lower_bound(__self.__keys_, __key, __self.__compare_);
     auto __last  = __self.__keys_.end();
     if (__it == __last || __self.__compare_(__key, *__it)) {

libcxx/include/__flat_set/ra_iterator.h

@@ -52,7 +52,7 @@ struct __ra_iterator {
 
   _LIBCPP_HIDE_FROM_ABI explicit __ra_iterator(_Iterator __iter) : __iter_(std::move(__iter)) {}
 
-  _Iterator __base() const noexcept(noexcept(_Iterator(__iter_))) { return __iter_; }
+  _LIBCPP_HIDE_FROM_ABI _Iterator __base() const noexcept(noexcept(_Iterator(__iter_))) { return __iter_; }
 
   _LIBCPP_HIDE_FROM_ABI decltype(auto) operator*() const { return *__iter_; }
   _LIBCPP_HIDE_FROM_ABI decltype(auto) operator->() const