Author: ericwf
Date: Tue Apr 18 21:07:12 2017
New Revision: 300652

URL: http://llvm.org/viewvc/llvm-project?rev=300652&view=rev
Log:
Fix tests for extended noexcept in the container adaptors tests

Modified:
    
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
    
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
    
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
    
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
    
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
    
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp

Modified: 
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp?rev=300652&r1=300651&r2=300652&view=diff
==============================================================================
--- 
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
 Tue Apr 18 21:07:12 2017
@@ -17,7 +17,6 @@
 
 // This tests a conforming extension
 
-// UNSUPPORTED: c++98, c++03
 
 #include <queue>
 #include <cassert>
@@ -27,8 +26,10 @@
 
 int main()
 {
+#if defined(_LIBCPP_VERSION)
     {
         typedef std::priority_queue<MoveOnly> C;
         static_assert(std::is_nothrow_default_constructible<C>::value, "");
     }
+#endif
 }

Modified: 
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp?rev=300652&r1=300651&r2=300652&view=diff
==============================================================================
--- 
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
 Tue Apr 18 21:07:12 2017
@@ -7,6 +7,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++98, c++03
+
 // <queue>
 
 // priority_queue(priority_queue&&)
@@ -15,8 +17,6 @@
 
 // This tests a conforming extension
 
-// UNSUPPORTED: c++98, c++03
-
 #include <queue>
 #include <cassert>
 

Modified: 
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp?rev=300652&r1=300651&r2=300652&view=diff
==============================================================================
--- 
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
 Tue Apr 18 21:07:12 2017
@@ -16,8 +16,6 @@
 
 // This tests a conforming extension
 
-// UNSUPPORTED: c++98, c++03
-
 #include <queue>
 #include <cassert>
 
@@ -26,8 +24,10 @@
 
 int main()
 {
+#if defined(_LIBCPP_VERSION)
     {
         typedef std::queue<MoveOnly> C;
         static_assert(std::is_nothrow_default_constructible<C>::value, "");
     }
+#endif
 }

Modified: 
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp?rev=300652&r1=300651&r2=300652&view=diff
==============================================================================
--- 
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
 Tue Apr 18 21:07:12 2017
@@ -16,7 +16,6 @@
 
 // This tests a conforming extension
 
-// UNSUPPORTED: c++98, c++03
 
 #include <queue>
 #include <cassert>
@@ -26,8 +25,10 @@
 
 int main()
 {
+#if defined(_LIBCPP_VERSION)
     {
         typedef std::queue<MoveOnly> C;
         static_assert(std::is_nothrow_move_constructible<C>::value, "");
     }
+#endif
 }

Modified: 
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp?rev=300652&r1=300651&r2=300652&view=diff
==============================================================================
--- 
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
 Tue Apr 18 21:07:12 2017
@@ -16,7 +16,6 @@
 
 // This tests a conforming extension
 
-// UNSUPPORTED: c++98, c++03
 
 #include <stack>
 #include <cassert>
@@ -26,8 +25,10 @@
 
 int main()
 {
+#if defined(_LIBCPP_VERSION)
     {
         typedef std::stack<MoveOnly> C;
         static_assert(std::is_nothrow_default_constructible<C>::value, "");
     }
+#endif
 }

Modified: 
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp?rev=300652&r1=300651&r2=300652&view=diff
==============================================================================
--- 
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
 (original)
+++ 
libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
 Tue Apr 18 21:07:12 2017
@@ -16,8 +16,6 @@
 
 // This tests a conforming extension
 
-// UNSUPPORTED: c++98, c++03
-
 #include <stack>
 #include <cassert>
 
@@ -26,8 +24,10 @@
 
 int main()
 {
+#if defined(_LIBCPP_VERSION)
     {
         typedef std::stack<MoveOnly> C;
         static_assert(std::is_nothrow_move_constructible<C>::value, "");
     }
+#endif
 }


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to