Rename pointer type and unguard it

Author: smallp-o-p

libcxx/include/optional

@@ -612,20 +612,18 @@ class _LIBCPP_DECLSPEC_EMPTY_BASES optional
       private __optional_sfinae_assign_base_t<_Tp> {
   using __base _LIBCPP_NODEBUG = __optional_move_assign_base<_Tp>;
 
-#    if _LIBCPP_STD_VER >= 26
-  using pointer       = std::add_pointer_t<_Tp>;
-  using const_pointer = std::add_pointer_t<const _Tp>;
-#    endif
+  using __pointer _LIBCPP_NODEBUG       = std::add_pointer_t<_Tp>;
+  using __const_pointer _LIBCPP_NODEBUG = std::add_pointer_t<const _Tp>;
 
 public:
   using value_type = _Tp;
 #    if _LIBCPP_STD_VER >= 26
 #      ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
-  using iterator       = __bounded_iter<__wrap_iter<pointer>>;
-  using const_iterator = __bounded_iter<__wrap_iter<const_pointer>>;
+  using iterator       = __bounded_iter<__wrap_iter<__pointer>>;
+  using const_iterator = __bounded_iter<__wrap_iter<__const_pointer>>;
 #      else
-  using iterator       = __wrap_iter<pointer>;
-  using const_iterator = __wrap_iter<const_pointer>;
+  using iterator       = __wrap_iter<__pointer>;
+  using const_iterator = __wrap_iter<__const_pointer>;
 #      endif
 #    endif
 
@@ -837,9 +835,9 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr iterator begin() noexcept {
 #      ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
     return std::__make_bounded_iter(
-        std::__wrap_iter<pointer>(std::addressof(this->__get())),
-        std::__wrap_iter<pointer>(std::addressof(this->__get())),
-        std::__wrap_iter<pointer>(std::addressof(this->__get()) + (this->has_value() ? 1 : 0)));
+        std::__wrap_iter<__pointer>(std::addressof(this->__get())),
+        std::__wrap_iter<__pointer>(std::addressof(this->__get())),
+        std::__wrap_iter<__pointer>(std::addressof(this->__get()) + (this->has_value() ? 1 : 0)));
 #      else
     return iterator(std::addressof(this->__get()));
 #      endif
@@ -848,9 +846,9 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr const_iterator begin() const noexcept {
 #      ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
     return std::__make_bounded_iter(
-        std::__wrap_iter<const_pointer>(std::addressof(this->__get())),
-        std::__wrap_iter<const_pointer>(std::addressof(this->__get())),
-        std::__wrap_iter<const_pointer>(std::addressof(this->__get()) + (this->has_value() ? 1 : 0)));
+        std::__wrap_iter<__const_pointer>(std::addressof(this->__get())),
+        std::__wrap_iter<__const_pointer>(std::addressof(this->__get())),
+        std::__wrap_iter<__const_pointer>(std::addressof(this->__get()) + (this->has_value() ? 1 : 0)));
 #      else
     return const_iterator(std::addressof(this->__get()));
 #      endif