[libcxx-commits] [libcxx] 4cd768e - [libcxx][test] `_VSTD` doesn't belong in test code

[Casey Carter via libcxx-commits]

Author: Casey Carter
Date: 2022-01-08T21:33:52-08:00
New Revision: 4cd768ed5e735da5f97be22c6da9483a39e20f3d

URL: https://github.com/llvm/llvm-project/commit/4cd768ed5e735da5f97be22c6da9483a39e20f3d
DIFF: https://github.com/llvm/llvm-project/commit/4cd768ed5e735da5f97be22c6da9483a39e20f3d.diff

LOG: [libcxx][test] `_VSTD` doesn't belong in test code

Added: 
    

Modified: 
    libcxx/test/std/language.support/cmp/cmp.alg/strong_order.pass.cpp
    libcxx/test/std/language.support/cmp/cmp.alg/weak_order.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/language.support/cmp/cmp.alg/strong_order.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.alg/strong_order.pass.cpp
index 9845746d789c5..c1bb2e3269d5a 100644
--- a/libcxx/test/std/language.support/cmp/cmp.alg/strong_order.pass.cpp
+++ b/libcxx/test/std/language.support/cmp/cmp.alg/strong_order.pass.cpp
@@ -351,10 +351,10 @@ constexpr bool test_1_3()
     // see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57484 for context.
 
     if (!std::is_constant_evaluated()) {
-        F nq = _VSTD::copysign(std::numeric_limits<F>::quiet_NaN(), F(-1));
-        F ns = _VSTD::copysign(std::numeric_limits<F>::signaling_NaN(), F(-1));
-        F ps = _VSTD::copysign(std::numeric_limits<F>::signaling_NaN(), F(+1));
-        F pq = _VSTD::copysign(std::numeric_limits<F>::quiet_NaN(), F(+1));
+        F nq = std::copysign(std::numeric_limits<F>::quiet_NaN(), F(-1));
+        F ns = std::copysign(std::numeric_limits<F>::signaling_NaN(), F(-1));
+        F ps = std::copysign(std::numeric_limits<F>::signaling_NaN(), F(+1));
+        F pq = std::copysign(std::numeric_limits<F>::quiet_NaN(), F(+1));
 
         assert(std::strong_order(nq, nq) == std::strong_ordering::equal);
 #ifndef TEST_BUGGY_SIGNALING_NAN

diff  --git a/libcxx/test/std/language.support/cmp/cmp.alg/weak_order.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.alg/weak_order.pass.cpp
index 64f257d916616..3e35188d121ef 100644
--- a/libcxx/test/std/language.support/cmp/cmp.alg/weak_order.pass.cpp
+++ b/libcxx/test/std/language.support/cmp/cmp.alg/weak_order.pass.cpp
@@ -348,10 +348,10 @@ constexpr bool test_1_3()
     // at compile-time, so the NAN-related tests must be runtime-only.
 
     if (!std::is_constant_evaluated()) {
-        F nq = _VSTD::copysign(std::numeric_limits<F>::quiet_NaN(), F(-1));
-        F ns = _VSTD::copysign(std::numeric_limits<F>::signaling_NaN(), F(-1));
-        F ps = _VSTD::copysign(std::numeric_limits<F>::signaling_NaN(), F(+1));
-        F pq = _VSTD::copysign(std::numeric_limits<F>::quiet_NaN(), F(+1));
+        F nq = std::copysign(std::numeric_limits<F>::quiet_NaN(), F(-1));
+        F ns = std::copysign(std::numeric_limits<F>::signaling_NaN(), F(-1));
+        F ps = std::copysign(std::numeric_limits<F>::signaling_NaN(), F(+1));
+        F pq = std::copysign(std::numeric_limits<F>::quiet_NaN(), F(+1));
 
         assert(std::weak_order(nq, nq) == std::weak_ordering::equivalent);
         assert(std::weak_order(nq, ns) == std::weak_ordering::equivalent);