[libcxx-commits] [PATCH] D118874: [libc++][nfc] Use TEST_SAFE_STATIC.

[Mark de Wever via Phabricator via libcxx-commits]

Mordante created this revision.
Mordante requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

This avoids using an libc++ internal macro in our tests.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D118874

Files:
  libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
  libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
  libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp


Index: libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
===================================================================
--- libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
+++ libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
@@ -20,8 +20,8 @@
 
 
 #if defined(_LIBCPP_VERSION) && TEST_STD_VER >= 11
-_LIBCPP_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single(nullptr);
-_LIBCPP_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime(nullptr);
+TEST_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single(nullptr);
+TEST_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime(nullptr);
 #endif
 
 
Index: libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
===================================================================
--- libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
+++ libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
@@ -31,8 +31,8 @@
 #include "unique_ptr_test_helper.h"
 
 #if defined(_LIBCPP_VERSION) && TEST_STD_VER >= 11
-_LIBCPP_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single;
-_LIBCPP_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime;
+TEST_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single;
+TEST_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime;
 #endif
 
 #if TEST_STD_VER >= 11
Index: libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
@@ -33,10 +33,8 @@
         struct TestConstexpr : public std::any {
           constexpr TestConstexpr() : std::any() {}
         };
-#ifdef _LIBCPP_SAFE_STATIC
-        _LIBCPP_SAFE_STATIC static std::any a;
+        TEST_SAFE_STATIC static std::any a;
         ((void)a);
-#endif
     }
     {
         DisableAllocationGuard g; ((void)g);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118874.405530.patch
Type: text/x-patch
Size: 2231 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220203/88edb7ac/attachment.bin>