Fix Intel C++ compiler incompatibility

diff --git a/cds/intrusive/striped_set/boost_avl_set.h b/cds/intrusive/striped_set/boost_avl_set.h
index b83aea461bf9f6caede1bf6b5d3836188e2d873a..0fdc31ab95f646eb86914032e67d6c9b7313ebcf 100644 (file)
--- a/cds/intrusive/striped_set/boost_avl_set.h
+++ b/cds/intrusive/striped_set/boost_avl_set.h
@@ -14,7 +14,7 @@ namespace cds { namespace intrusive { namespace striped_set {
     class adapt< boost::intrusive::avl_set< T, P1, P2, P3, P4, P5 >, Options... >
     {
     public:
-        typedef boost::intrusive::avl_set< T >  container_type;   ///< underlying intrusive container type
+        typedef boost::intrusive::avl_set< T, P1, P2, P3, P4, P5 >  container_type;   ///< underlying intrusive container type
 
     public:
         typedef details::boost_intrusive_set_adapter<container_type>   type;  ///< Result of the metafunction

diff --git a/tests/test-hdr/misc/cxx11_atomic_class.cpp b/tests/test-hdr/misc/cxx11_atomic_class.cpp
index 7637b72c95a4c4e00428d1afed0dfa47a3d03b9a..cafd6a62ef1dd9f0b7475630ec5e279825d95703 100644 (file)
--- a/tests/test-hdr/misc/cxx11_atomic_class.cpp
+++ b/tests/test-hdr/misc/cxx11_atomic_class.cpp
@@ -365,15 +365,16 @@ namespace misc {
         {
             const atomics::memory_order oLoad = convert_to_load_order( order );
             const atomics::memory_order oStore = convert_to_store_order( order );
+            const atomics::memory_order oExchange = convert_to_exchange_order( order );
 
             CPPUNIT_ASSERT( a.is_lock_free() );
             a.store( false, oStore );
             CPPUNIT_ASSERT( a == false );
             CPPUNIT_ASSERT( a.load( oLoad ) == false );
 
-            CPPUNIT_ASSERT( a.exchange( true, order ) == false );
+            CPPUNIT_ASSERT( a.exchange( true, oExchange ) == false );
             CPPUNIT_ASSERT( a.load( oLoad ) == true );
-            CPPUNIT_ASSERT( a.exchange( false, order ) == true );
+            CPPUNIT_ASSERT( a.exchange( false, oExchange ) == true );
             CPPUNIT_ASSERT( a.load( oLoad ) == false );
 
             bool expected = false;
@@ -394,7 +395,7 @@ namespace misc {
 
             CPPUNIT_ASSERT( a.load( oLoad ) == true );
 
-            CPPUNIT_ASSERT( a.exchange( false, order ) == true );
+            CPPUNIT_ASSERT( a.exchange( false, oExchange ) == true );
         }
 
 
@@ -667,16 +668,6 @@ namespace misc {
         void test_atomic_unsigned_long()        { test_atomic_integral<unsigned long>(); }
         void test_atomic_long_long()            { test_atomic_integral<long long>(); }
         void test_atomic_unsigned_long_long()   { test_atomic_integral<unsigned long long>(); }
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//        void test_atomic_char16_t()             { test_atomic_integral<char16_t>(); }
-//        void test_atomic_char32_t()             { test_atomic_integral<char32_t>(); }
-//#endif
-//        void test_atomic_wchar_t()
-//        {
-//#if CDS_OS_TYPE != CDS_OS_HPUX
-//            test_atomic_integral<wchar_t>();
-//#endif
-//        }
 
         void test_atomic_char_volatile()                 { test_atomic_integral_volatile<char>(); }
         void test_atomic_signed_char_volatile()          { test_atomic_integral_volatile<signed char>(); }
@@ -689,16 +680,6 @@ namespace misc {
         void test_atomic_unsigned_long_volatile()        { test_atomic_integral_volatile<unsigned long>(); }
         void test_atomic_long_long_volatile()            { test_atomic_integral_volatile<long long>(); }
         void test_atomic_unsigned_long_long_volatile()   { test_atomic_integral_volatile<unsigned long long>(); }
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//        void test_atomic_char16_t_volatile()             { test_atomic_integral_volatile<char16_t>(); }
-//        void test_atomic_char32_t_volatile()             { test_atomic_integral_volatile<char32_t>(); }
-//#endif
-//        void test_atomic_wchar_t_volatile()
-//        {
-//#if CDS_OS_TYPE != CDS_OS_HPUX
-//            test_atomic_integral_volatile<wchar_t>();
-//#endif
-//        }
 
         void test_atomic_pointer_void()         { do_test_atomic_pointer_void<false>() ;}
         void test_atomic_pointer_void_volatile(){ do_test_atomic_pointer_void<true>() ;}
@@ -732,11 +713,6 @@ namespace misc {
             CPPUNIT_TEST( test_atomic_unsigned_long)
             CPPUNIT_TEST( test_atomic_long_long)
             CPPUNIT_TEST( test_atomic_unsigned_long_long)
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//            CPPUNIT_TEST( test_atomic_char16_t )
-//            CPPUNIT_TEST( test_atomic_char32_t )
-//#endif
-//            CPPUNIT_TEST( test_atomic_wchar_t)
 
             CPPUNIT_TEST( test_atomic_bool_volatile )
             CPPUNIT_TEST( test_atomic_char_volatile )
@@ -750,11 +726,6 @@ namespace misc {
             CPPUNIT_TEST( test_atomic_unsigned_long_volatile)
             CPPUNIT_TEST( test_atomic_long_long_volatile)
             CPPUNIT_TEST( test_atomic_unsigned_long_long_volatile)
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//            CPPUNIT_TEST( test_atomic_char16_t_volatile )
-//            CPPUNIT_TEST( test_atomic_char32_t_volatile )
-//#endif
-//            CPPUNIT_TEST( test_atomic_wchar_t_volatile)
 
             CPPUNIT_TEST( test_atomic_pointer_void)
             CPPUNIT_TEST( test_atomic_pointer_void_volatile)

diff --git a/tests/test-hdr/misc/cxx11_atomic_func.cpp b/tests/test-hdr/misc/cxx11_atomic_func.cpp
index 724670e3e391dc2ab457c7149bc69fabb478a33a..d5f7f2f90240e2cf7e8c3a65993ba8561f58591d 100644 (file)
--- a/tests/test-hdr/misc/cxx11_atomic_func.cpp
+++ b/tests/test-hdr/misc/cxx11_atomic_func.cpp
@@ -333,15 +333,16 @@ namespace misc {
         {
             const atomics::memory_order oLoad = convert_to_load_order( order );
             const atomics::memory_order oStore = convert_to_store_order( order );
+            const atomics::memory_order oExchange = convert_to_exchange_order( order );
 
             CPPUNIT_ASSERT( atomics::atomic_is_lock_free( &a ) );
             atomics::atomic_store_explicit( &a, false, oStore );
             CPPUNIT_ASSERT( a == false );
             CPPUNIT_ASSERT( atomics::atomic_load_explicit( &a, oLoad ) == false );
 
-            CPPUNIT_ASSERT( atomics::atomic_exchange_explicit( &a, true, order ) == false );
+            CPPUNIT_ASSERT( atomics::atomic_exchange_explicit( &a, true, oExchange ) == false );
             CPPUNIT_ASSERT( atomics::atomic_load_explicit( &a, oLoad ) == true );
-            CPPUNIT_ASSERT( atomics::atomic_exchange_explicit( &a, false, order ) == true );
+            CPPUNIT_ASSERT( atomics::atomic_exchange_explicit( &a, false, oExchange ) == true );
             CPPUNIT_ASSERT( atomics::atomic_load_explicit( &a, oLoad ) == false );
 
             bool expected = false;
@@ -361,7 +362,7 @@ namespace misc {
 
             CPPUNIT_ASSERT( atomics::atomic_load_explicit( &a, oLoad ) == true );
 
-            CPPUNIT_ASSERT( atomics::atomic_exchange_explicit( &a, false, order ) == true );
+            CPPUNIT_ASSERT( atomics::atomic_exchange_explicit( &a, false, oExchange ) == true );
         }
 
         template <typename Atomic, typename Integral>
@@ -620,24 +621,6 @@ namespace misc {
         void test_atomic_long_long_volatile()   { test_atomic_integral_volatile<long long>(); }
         void test_atomic_unsigned_long_long()   { test_atomic_integral<unsigned long long>(); }
         void test_atomic_unsigned_long_long_volatile() { test_atomic_integral_volatile<unsigned long long>(); }
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//        void test_atomic_char16_t()             { test_atomic_integral<char16_t>(); }
-//        void test_atomic_char16_t_volatile()    { test_atomic_integral_volatile<char16_t>(); }
-//        void test_atomic_char32_t()             { test_atomic_integral<char32_t>(); }
-//        void test_atomic_char32_t_volatile()    { test_atomic_integral_volatile<char32_t>(); }
-//#endif
-//        void test_atomic_wchar_t()
-//        {
-//#if CDS_OS_TYPE != CDS_OS_HPUX
-//            test_atomic_integral<wchar_t>();
-//#endif
-//        }
-//        void test_atomic_wchar_t_volatile()
-//        {
-//#if CDS_OS_TYPE != CDS_OS_HPUX
-//            test_atomic_integral_volatile<wchar_t>();
-//#endif
-//        }
 
         void test_atomic_pointer_void()         { do_test_atomic_pointer_void<false>() ;}
         void test_atomic_pointer_void_volatile(){ do_test_atomic_pointer_void<true>() ;}
@@ -688,11 +671,6 @@ namespace misc {
             CPPUNIT_TEST( test_atomic_unsigned_long)
             CPPUNIT_TEST( test_atomic_long_long)
             CPPUNIT_TEST( test_atomic_unsigned_long_long)
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//            CPPUNIT_TEST( test_atomic_char16_t )
-//            CPPUNIT_TEST( test_atomic_char32_t )
-//#endif
-//            CPPUNIT_TEST( test_atomic_wchar_t)
 
             CPPUNIT_TEST( test_atomic_bool_volatile )
             CPPUNIT_TEST( test_atomic_char_volatile )
@@ -706,11 +684,6 @@ namespace misc {
             CPPUNIT_TEST( test_atomic_unsigned_long_volatile)
             CPPUNIT_TEST( test_atomic_long_long_volatile)
             CPPUNIT_TEST( test_atomic_unsigned_long_long_volatile)
-//#if CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION >= 40400
-//            CPPUNIT_TEST( test_atomic_char16_t_volatile )
-//            CPPUNIT_TEST( test_atomic_char32_t_volatile )
-//#endif
-//            CPPUNIT_TEST( test_atomic_wchar_t_volatile)
 
             CPPUNIT_TEST( test_atomic_pointer_void)
             CPPUNIT_TEST( test_atomic_pointer_void_volatile)

diff --git a/tests/test-hdr/misc/cxx11_convert_memory_order.h b/tests/test-hdr/misc/cxx11_convert_memory_order.h
index cf6be7250a21f98f143cf4af5bf5cf0245b5cfac..a9dfc2436ab2e4a4f7084c6542f0c513e36670d3 100644 (file)
--- a/tests/test-hdr/misc/cxx11_convert_memory_order.h
+++ b/tests/test-hdr/misc/cxx11_convert_memory_order.h
@@ -29,6 +29,18 @@ namespace misc {
         }
     }
 
+#if CDS_COMPILER == CDS_COMPILER_INTEL
+    static inline atomics::memory_order convert_to_exchange_order( atomics::memory_order order )
+    {
+        return order == atomics::memory_order_consume ? atomics::memory_order_relaxed : order;
+    }
+#else
+    static inline atomics::memory_order convert_to_exchange_order( atomics::memory_order order )
+    {
+        return order;
+    }
+#endif
+
     template <typename T, bool Volatile>
     struct add_volatile;