Changed: use padding option instead of alignment one

[libcds.git] / tests / test-hdr / queue / hdr_basketqueue_hp.cpp

diff --git a/tests/test-hdr/queue/hdr_basketqueue_hp.cpp b/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
index 80b2a5b4f8e9a70a9f1c32d3f4448689b7c29839..2e608d3acfe53ad1092bdb8c6255d9b5d30c1953 100644 (file)
--- a/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_basketqueue_hp.cpp
@@ -3,7 +3,7 @@
 #include <cds/gc/hp.h>
 #include <cds/container/basket_queue.h>
 
-#include "queue/hdr_queue_new.h"
+#include "queue/hdr_queue.h"
 
 namespace queue {
 
@@ -36,7 +36,7 @@ namespace queue {
 
     void HdrTestQueue::BasketQueue_HP_Counted_relax()
     {
-        typedef cds::container::BasketQueue< cds::gc::HP, int, 
+        typedef cds::container::BasketQueue< cds::gc::HP, int,
             typename cds::container::basket_queue::make_traits <
                 cds::opt::item_counter< cds::atomicity::item_counter >
                 ,cds::opt::memory_model< cds::opt::v::relaxed_ordering>
@@ -71,10 +71,10 @@ namespace queue {
         typedef cds::container::BasketQueue < cds::gc::HP, int,
             typename cds::container::basket_queue::make_traits <
                 cds::opt::memory_model< cds::opt::v::relaxed_ordering>
-                ,cds::opt::alignment< 16 >
+                ,cds::opt::padding< 16 >
             >::type
         > queue_type;
-        test_ic< queue_type >();
+        test_no_ic< queue_type >();
     }
 
     void HdrTestQueue::BasketQueue_HP_Counted_relax_align()
@@ -83,10 +83,10 @@ namespace queue {
         {
             typedef cds::atomicity::item_counter item_counter;
             typedef cds::opt::v::relaxed_ordering memory_model;
-            enum { alignment = 32 };
+            enum { padding = 32 };
         };
         typedef cds::container::BasketQueue < cds::gc::HP, int, traits > queue_type;
-        test_ic< queue_type >( 0 );
+        test_ic< queue_type >();
     }
 
     void HdrTestQueue::BasketQueue_HP_seqcst_align()
@@ -94,7 +94,7 @@ namespace queue {
         typedef cds::container::BasketQueue < cds::gc::HP, int,
             typename cds::container::basket_queue::make_traits <
                 cds::opt::memory_model< cds::opt::v::sequential_consistent>
-                , cds::opt::alignment< cds::opt::no_special_alignment >
+                , cds::opt::padding< cds::opt::no_special_padding >
             > ::type
         > queue_type;
         test_no_ic< queue_type >();
@@ -106,10 +106,10 @@ namespace queue {
             typename cds::container::basket_queue::make_traits <
                 cds::opt::item_counter< cds::atomicity::item_counter >
                 ,cds::opt::memory_model< cds::opt::v::sequential_consistent>
-                ,cds::opt::alignment< cds::opt::cache_line_alignment >
+                ,cds::opt::padding< cds::opt::cache_line_padding >
             > ::type
         > queue_type;
-        test_no_ic< queue_type >();
+        test_ic< queue_type >();
     }
 
 }   // namespace queue