[libcxx-commits] [libcxx] 5dc1da3 - [libc++][nfc] Use TEST_SAFE_STATIC.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2022-02-08T17:39:21+01:00
New Revision: 5dc1da3e304c9ec22b6e0f880adfe54f8939d8ee

URL: https://github.com/llvm/llvm-project/commit/5dc1da3e304c9ec22b6e0f880adfe54f8939d8ee
DIFF: https://github.com/llvm/llvm-project/commit/5dc1da3e304c9ec22b6e0f880adfe54f8939d8ee.diff

LOG: [libc++][nfc] Use TEST_SAFE_STATIC.

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

Reviewed By: #libc, philnik, ldionne

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

Added: 
    

Modified: 
    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

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
index 332d5ed812b13..2c2715c6444c0 100644
--- a/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp
@@ -33,10 +33,8 @@ int main(int, char**)
         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);

diff  --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
index e8b356b6b526e..3919d67ac4445 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
@@ -30,12 +30,10 @@
 #include "deleter_types.h"
 #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;
-#endif
-
 #if TEST_STD_VER >= 11
+TEST_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single;
+TEST_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime;
+
 struct NonDefaultDeleter {
   NonDefaultDeleter() = delete;
   void operator()(void*) const {}

diff  --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
index 74f0c5708a3a4..82d1cb28892bf 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
@@ -19,13 +19,10 @@
 #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(nullptr);
-_LIBCPP_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime(nullptr);
-#endif
-
-
 #if TEST_STD_VER >= 11
+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);
+
 struct NonDefaultDeleter {
   NonDefaultDeleter() = delete;
   void operator()(void*) const {}