X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=tests%2Ftest-hdr%2Fqueue%2Fhdr_intrusive_moirqueue_hp.cpp;h=8eaa2afd4548a2824ae5701ffb78a8bd47abf492;hp=7573c28e1ab691b5e8bfacabc4b08b0e0af893bc;hb=a01ecc87dadf753538d4c22feb98f7e00a66a4d1;hpb=7f0bfa169a4f46f29f5bb6a29d96e1db6a41f3ed

diff --git a/tests/test-hdr/queue/hdr_intrusive_moirqueue_hp.cpp b/tests/test-hdr/queue/hdr_intrusive_moirqueue_hp.cpp
index 7573c28e..8eaa2afd 100644
--- a/tests/test-hdr/queue/hdr_intrusive_moirqueue_hp.cpp
+++ b/tests/test-hdr/queue/hdr_intrusive_moirqueue_hp.cpp
@@ -109,18 +109,18 @@ namespace queue {
             >::type
         > MoirQueue_HP_member_stat;
 
-        // HP base hook + alignment
+        // HP base hook + padding
         typedef ci::MoirQueue< cds::gc::HP, base_item_type,
             typename ci::msqueue::make_traits<
                 ci::opt::disposer< IntrusiveQueueHeaderTest::faked_disposer >
                 ,ci::opt::hook<
                     ci::msqueue::base_hook< ci::opt::gc<cds::gc::HP> >
                 >
-                ,co::alignment< 32 >
+                ,co::padding< 32 >
             >::type
         > MoirQueue_HP_base_align;
 
-        // HP member hook + alignment
+        // HP member hook + padding
         typedef ci::MoirQueue< cds::gc::HP, member_item_type,
             typename ci::msqueue::make_traits<
                 ci::opt::hook<
@@ -129,42 +129,42 @@ namespace queue {
                         ci::opt::gc<cds::gc::HP>
                     >
                 >
-                ,co::alignment< 32 >
+                ,co::padding< 32 >
                 ,ci::opt::disposer< IntrusiveQueueHeaderTest::faked_disposer >
             >::type
         > MoirQueue_HP_member_align;
 
-        // HP base hook + no alignment
+        // HP base hook + no padding
         struct traits_MoirQueue_HP_base_noalign : public ci::msqueue::traits {
             typedef ci::msqueue::base_hook< ci::opt::gc<cds::gc::HP> > hook;
             typedef IntrusiveQueueHeaderTest::faked_disposer disposer;
-            enum { alignment = co::no_special_alignment };
+            enum { padding = co::no_special_padding };
         };
         typedef ci::MoirQueue< cds::gc::HP, base_item_type, traits_MoirQueue_HP_base_noalign > MoirQueue_HP_base_noalign;
 
-        // HP member hook + no alignment
+        // HP member hook + no padding
         struct traits_MoirQueue_HP_member_noalign : public ci::msqueue::traits {
             typedef ci::msqueue::member_hook <
                 offsetof( member_item_type, hMember ),
                 ci::opt::gc < cds::gc::HP >
             > hook;
             typedef IntrusiveQueueHeaderTest::faked_disposer disposer;
-            enum { alignment = co::no_special_alignment };
+            enum { padding = co::no_special_padding };
         };
         typedef ci::MoirQueue< cds::gc::HP, member_item_type, traits_MoirQueue_HP_member_noalign > MoirQueue_HP_member_noalign;
 
 
-        // HP base hook + cache alignment
+        // HP base hook + cache padding
         struct traits_MoirQueue_HP_base_cachealign : public traits_MoirQueue_HP_base_noalign
         {
-            enum { alignment = co::cache_line_alignment };
+            enum { padding = co::cache_line_padding };
         };
         typedef ci::MoirQueue< cds::gc::HP, base_item_type, traits_MoirQueue_HP_base_cachealign > MoirQueue_HP_base_cachealign;
 
-        // HP member hook + cache alignment
+        // HP member hook + cache padding
         struct traits_MoirQueue_HP_member_cachealign : public traits_MoirQueue_HP_member_noalign
         {
-            enum { alignment = co::cache_line_alignment };
+            enum { padding = co::cache_line_padding };
         };
         typedef ci::MoirQueue< cds::gc::HP, member_item_type, traits_MoirQueue_HP_member_cachealign > MoirQueue_HP_member_cachealign;
     }