Split up set2 unit test to reduce compiling time and memory

[libcds.git] / tests / unit / set2 / set_delodd.h

diff --git a/tests/unit/set2/set_delodd.h b/tests/unit/set2/set_delodd.h
index f06102c9e09a0bbcfd347ac2417b69e4826d79d2..b6291a14068806365b94d796cc8371b65ab1722e 100644 (file)
--- a/tests/unit/set2/set_delodd.h
+++ b/tests/unit/set2/set_delodd.h
@@ -1,15 +1,15 @@
 //$$CDS-header$$
 
 #include "cppunit/thread.h"
-#include "set2/set_types.h"
+#include "set2/set_type.h"
 #include <algorithm> // random_shuffle
 
 namespace set2 {
 
-#    define TEST_SET(X)         void X() { test<SetTypes<key_type, value_type>::X >()    ; }
-#    define TEST_SET_EXTRACT(X) void X() { test_extract<SetTypes<key_type, value_type>::X >()    ; }
-#    define TEST_SET_NOLF(X)    void X() { test_nolf<SetTypes<key_type, value_type>::X >()    ; }
-#    define TEST_SET_NOLF_EXTRACT(X)    void X() { test_nolf_extract<SetTypes<key_type, value_type>::X >()    ; }
+#    define TEST_SET(IMPL, C, X)         void C::X() { test<set_type<IMPL, key_type, value_type>::X >(); }
+#    define TEST_SET_EXTRACT(IMPL, C, X) void C::X() { test_extract<set_type<IMPL, key_type, value_type>::X >(); }
+#    define TEST_SET_NOLF(IMPL, C, X)    void C::X() { test_nolf<set_type<IMPL, key_type, value_type>::X >(); }
+#    define TEST_SET_NOLF_EXTRACT(IMPL, C, X) void C::X() { test_nolf_extract<set_type<IMPL, key_type, value_type>::X >(); }
 
     namespace {
         struct key_thread
@@ -26,7 +26,7 @@ namespace set2 {
             {}
         };
 
-        typedef SetTypes<key_thread, size_t>::key_val     key_value_pair;
+        typedef set_type_base<key_thread, size_t>::key_val     key_value_pair;
     }
 
     template <>