From 6dc37ab246f019dde61a9178006032b7ca93f359 Mon Sep 17 00:00:00 2001 From: khizmax Date: Wed, 2 Dec 2015 01:21:09 +0300 Subject: [PATCH] Removed consume semantics from all tests --- tests/test-hdr/misc/cxx11_atomic_class.cpp | 14 +++++++------- tests/test-hdr/misc/cxx11_atomic_func.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test-hdr/misc/cxx11_atomic_class.cpp b/tests/test-hdr/misc/cxx11_atomic_class.cpp index fe769db0..b7ad9eb1 100644 --- a/tests/test-hdr/misc/cxx11_atomic_class.cpp +++ b/tests/test-hdr/misc/cxx11_atomic_class.cpp @@ -32,7 +32,7 @@ namespace misc { } do_test_atomic_flag_mo( f, atomics::memory_order_relaxed ); - do_test_atomic_flag_mo( f, atomics::memory_order_consume ); + //do_test_atomic_flag_mo( f, atomics::memory_order_consume ); do_test_atomic_flag_mo( f, atomics::memory_order_acquire ); do_test_atomic_flag_mo( f, atomics::memory_order_release ); do_test_atomic_flag_mo( f, atomics::memory_order_acq_rel ); @@ -298,9 +298,9 @@ namespace misc { do_test_atomic_integral(a); do_test_atomic_integral( a, atomics::memory_order_relaxed ); -#if !(CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION < 40900) - do_test_atomic_integral( a, atomics::memory_order_consume ); -#endif +//#if !(CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION < 40900) +// do_test_atomic_integral( a, atomics::memory_order_consume ); +//#endif do_test_atomic_integral( a, atomics::memory_order_acquire ); do_test_atomic_integral( a, atomics::memory_order_release ); do_test_atomic_integral( a, atomics::memory_order_acq_rel ); @@ -500,7 +500,7 @@ namespace misc { } do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_relaxed ); - do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_consume ); + //do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_consume ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_acquire ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_release ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_acq_rel ); @@ -605,7 +605,7 @@ namespace misc { } test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_relaxed ); - test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_consume ); + //test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_consume ); test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_acquire ); test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_release ); test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_acq_rel ); @@ -641,7 +641,7 @@ namespace misc { do_test_atomic_bool( a[i] ); do_test_atomic_bool( a[i], atomics::memory_order_relaxed ); - do_test_atomic_bool( a[i], atomics::memory_order_consume ); + //do_test_atomic_bool( a[i], atomics::memory_order_consume ); do_test_atomic_bool( a[i], atomics::memory_order_acquire ); do_test_atomic_bool( a[i], atomics::memory_order_release ); do_test_atomic_bool( a[i], atomics::memory_order_acq_rel ); diff --git a/tests/test-hdr/misc/cxx11_atomic_func.cpp b/tests/test-hdr/misc/cxx11_atomic_func.cpp index 15ee5204..cc12bdf3 100644 --- a/tests/test-hdr/misc/cxx11_atomic_func.cpp +++ b/tests/test-hdr/misc/cxx11_atomic_func.cpp @@ -458,7 +458,7 @@ namespace misc { } test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_relaxed ); - test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_consume ); + //test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_consume ); test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_acquire ); test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_release ); test_atomic_pointer_for_( a, arr, aSize, atomics::memory_order_acq_rel ); @@ -553,7 +553,7 @@ namespace misc { } do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_relaxed ); - do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_consume ); + //do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_consume ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_acquire ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_release ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_acq_rel ); -- 2.34.1