MSPriorityQueue refactoring, bug fix
[libcds.git] / tests / test-hdr / priority_queue / hdr_mspqueue_dyn.cpp
index 7a525cb8ce6a4891d862c0b2bfaec42de2d05d92..3c381b544e71ca4fe9774749e1d5e5edfcb3e517 100644 (file)
@@ -2,7 +2,6 @@
 
 #include "priority_queue/hdr_pqueue.h"
 #include <cds/container/mspriority_queue.h>
-#include <mutex>
 
 namespace priority_queue {
     namespace pqueue {
@@ -53,13 +52,13 @@ namespace priority_queue {
 
     void PQueueHdrTest::MSPQueue_dyn_cmpless()
     {
-        typedef cds::container::MSPriorityQueue< PQueueHdrTest::value_type,
-            cds::container::mspriority_queue::make_traits<
-                cds::opt::buffer< buffer_type >
-                ,cds::opt::less< PQueueHdrTest::less >
-                ,cds::opt::compare< PQueueHdrTest::compare >
-            >::type
-        > pqueue;
+        struct pqueue_traits : public cds::container::mspriority_queue::traits
+        {
+            typedef buffer_type buffer;
+            typedef PQueueHdrTest::less less;
+            typedef PQueueHdrTest::compare compare;
+        };
+        typedef cds::container::MSPriorityQueue< PQueueHdrTest::value_type, pqueue_traits > pqueue;
 
         test_msq_dyn<pqueue>();
     }