Revert "[libc++][NFC] Replace a few "namespace std" with the correct macro (llvm#140510)"

This reverts commit 1d411f2.

Author: jyknight

libcxx/include/initializer_list

@@ -53,9 +53,10 @@ template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in
 #    pragma GCC system_header
 #  endif
 
-#  ifndef _LIBCPP_CXX03_LANG
+namespace std // purposefully not versioned
+{
 
-_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
+#  ifndef _LIBCPP_CXX03_LANG
 
 template <class _Ep>
 class _LIBCPP_NO_SPECIALIZATIONS initializer_list {
@@ -94,10 +95,10 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _Ep* end(initia
   return __il.end();
 }
 
-_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
-
 #  endif // !defined(_LIBCPP_CXX03_LANG)
 
+} // namespace std
+
 #  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #  endif

libcxx/include/optional

@@ -244,8 +244,8 @@ namespace std {
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
 
-_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
-_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
+namespace std // purposefully not using versioning namespace
+{
 
 class _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optional_access : public exception {
 public:
@@ -257,8 +257,7 @@ public:
   const char* what() const _NOEXCEPT override;
 };
 
-_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
-_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
+} // namespace std
 
 #  if _LIBCPP_STD_VER >= 17
 

libcxx/include/stdexcept

@@ -73,8 +73,8 @@ public:
 
 _LIBCPP_END_NAMESPACE_STD
 
-_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
-_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
+namespace std // purposefully not using versioning namespace
+{
 
 class _LIBCPP_EXPORTED_FROM_ABI logic_error : public exception {
 #  ifndef _LIBCPP_ABI_VCRUNTIME
@@ -207,8 +207,7 @@ public:
 #  endif
 };
 
-_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
-_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
+} // namespace std
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 

libcxx/include/typeinfo

@@ -76,8 +76,8 @@ public:
 #    include <vcruntime_typeinfo.h>
 #  else
 
-_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
-_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
+namespace std // purposefully not using versioning namespace
+{
 
 #    if defined(_LIBCPP_ABI_MICROSOFT)
 
@@ -348,8 +348,7 @@ public:
   const char* what() const _NOEXCEPT override;
 };
 
-_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
-_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
+} // namespace std
 
 #  endif // defined(_LIBCPP_ABI_VCRUNTIME)