shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
We've added a new macro for the unversioned `namespace std` cases in
#133009, but it seems we've missed a few places. This fixes the places I
just found.
This commit is contained in:
Nikolas Klauser 2025-05-23 22:56:24 +02:00 committed by GitHub
parent eb341f0b04
commit 1d411f27c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcxx/include/initializer_list
View File

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

7
libcxx/include/optional
View File

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

7
libcxx/include/stdexcept
View File

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

7
libcxx/include/typeinfo
View File

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