[libcxx-commits] [libcxx] r367268 - Fix tests with modules enabled

[Eric Fiselier via libcxx-commits]

Author: ericwf
Date: Mon Jul 29 15:48:51 2019
New Revision: 367268

URL: http://llvm.org/viewvc/llvm-project?rev=367268&view=rev
Log:
Fix tests with modules enabled

Modified:
    libcxx/trunk/test/libcxx/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.cxx1z.pass.cpp
    libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
    libcxx/trunk/test/libcxx/depr/depr.function.objects/depr.adaptors.cxx1z.pass.cpp
    libcxx/trunk/test/std/utilities/function.objects/negators/binary_negate.pass.cpp
    libcxx/trunk/test/std/utilities/function.objects/negators/not1.pass.cpp
    libcxx/trunk/test/std/utilities/function.objects/negators/not2.pass.cpp
    libcxx/trunk/test/std/utilities/function.objects/negators/unary_negate.pass.cpp

Modified: libcxx/trunk/test/libcxx/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.cxx1z.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.cxx1z.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.cxx1z.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.cxx1z.pass.cpp Mon Jul 29 15:48:51 2019
@@ -25,6 +25,7 @@
 // REQUIRES: verify-support
 
 // MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 

Modified: libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp Mon Jul 29 15:48:51 2019
@@ -16,6 +16,7 @@
 //  is defined before including <memory>, then auto_ptr will be restored.
 
 // MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 

Modified: libcxx/trunk/test/libcxx/depr/depr.function.objects/depr.adaptors.cxx1z.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/depr/depr.function.objects/depr.adaptors.cxx1z.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/depr/depr.function.objects/depr.adaptors.cxx1z.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/depr/depr.function.objects/depr.adaptors.cxx1z.pass.cpp Mon Jul 29 15:48:51 2019
@@ -14,6 +14,7 @@
 //  is defined before including <functional>, then they will be restored.
 
 // MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_BINDERS
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_ENABLE_CXX17_REMOVED_BINDERS
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 

Modified: libcxx/trunk/test/std/utilities/function.objects/negators/binary_negate.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/negators/binary_negate.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/function.objects/negators/binary_negate.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/function.objects/negators/binary_negate.pass.cpp Mon Jul 29 15:48:51 2019
@@ -10,6 +10,7 @@
 
 // binary_negate
 
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
 #include <functional>

Modified: libcxx/trunk/test/std/utilities/function.objects/negators/not1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/negators/not1.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/function.objects/negators/not1.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/function.objects/negators/not1.pass.cpp Mon Jul 29 15:48:51 2019
@@ -10,6 +10,7 @@
 
 // not1
 
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
 #include <functional>

Modified: libcxx/trunk/test/std/utilities/function.objects/negators/not2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/negators/not2.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/function.objects/negators/not2.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/function.objects/negators/not2.pass.cpp Mon Jul 29 15:48:51 2019
@@ -10,6 +10,7 @@
 
 // not2
 
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
 #include <functional>

Modified: libcxx/trunk/test/std/utilities/function.objects/negators/unary_negate.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/negators/unary_negate.pass.cpp?rev=367268&r1=367267&r2=367268&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/function.objects/negators/unary_negate.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/function.objects/negators/unary_negate.pass.cpp Mon Jul 29 15:48:51 2019
@@ -10,6 +10,7 @@
 
 // unary_negate
 
+// MODULES_DEFINES: _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
 #include <functional>