[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
NOKEYCHECK=True
GitOrigin-RevId: 5dc1da3e304c9ec22b6e0f880adfe54f8939d8ee
diff --git a/test/std/utilities/any/any.class/any.cons/default.pass.cpp b/test/std/utilities/any/any.class/any.cons/default.pass.cpp
index 332d5ed..2c2715c 100644
--- a/test/std/utilities/any/any.class/any.cons/default.pass.cpp
+++ b/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);
diff --git a/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp b/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
index e8b356b..3919d67 100644
--- a/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
+++ b/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/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp b/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
index 74f0c57..82d1cb2 100644
--- a/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
+++ b/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 {}