[libcxx-commits] [libcxx] 453620f - [libc++] Make _VSTD and alias for std

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2022-02-01T22:41:51+01:00
New Revision: 453620f55ea38186cdf165b1ca2deb6c6b226132

URL: https://github.com/llvm/llvm-project/commit/453620f55ea38186cdf165b1ca2deb6c6b226132
DIFF: https://github.com/llvm/llvm-project/commit/453620f55ea38186cdf165b1ca2deb6c6b226132.diff

LOG: [libc++] Make _VSTD and alias for std

There is no practical difference between `_VSTD` and `std` so we should just remove `_VSTD`. This is the first step.

Reviewed By: ldionne, #libc

Spies: jeroen.dobbelaere, wmaxey, EricWF, lebedev.ri, __simt__, dim, mgrang, sstefan1, wenlei, smeenai, libcxx-commits, #libc_vendors

Differential Revision: https://reviews.llvm.org/D117811

Added: 
    

Modified: 
    libcxx/docs/ReleaseNotes.rst
    libcxx/include/__config

Removed: 
    


################################################################################
diff  --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
index 83164d7e21f2..8d645426138a 100644
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -140,6 +140,10 @@ API Changes
   instead. The ``<experimental/coroutine>`` header will be removed
   in LLVM 15.
 
+- ``_VSTD`` is now an alias for ``std`` instead of ``std::_LIBCPP_ABI_NAMESPACE``.
+  This is technically not a functional change, except for folks that might have been
+  using ``_VSTD`` in creative ways (which has never been officially supported).
+
 ABI Changes
 -----------
 

diff  --git a/libcxx/include/__config b/libcxx/include/__config
index 98f136a791e1..3c3d4b57c76e 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -821,10 +821,10 @@ typedef __char32_t char32_t;
 // Inline namespaces are available in Clang/GCC/MSVC regardless of C++ dialect.
 #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_ABI_NAMESPACE {
 #define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_ABI_NAMESPACE
+#define _VSTD std
 _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 
-#if _LIBCPP_STD_VER >= 17
+#if _LIBCPP_STD_VER > 14
 #define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \
   _LIBCPP_BEGIN_NAMESPACE_STD inline namespace __fs { namespace filesystem {
 #else