X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=tests%2Ftest-hdr%2Fqueue%2Fhdr_intrusive_moirqueue_dhp.cpp;h=64602fe2687a63fb0cbb51f7dfa36ed8ceb5acf0;hp=a447573b2bf5d0c3a7ccd9517f60dda3f2c7f01b;hb=a01ecc87dadf753538d4c22feb98f7e00a66a4d1;hpb=7f0bfa169a4f46f29f5bb6a29d96e1db6a41f3ed

diff --git a/tests/test-hdr/queue/hdr_intrusive_moirqueue_dhp.cpp b/tests/test-hdr/queue/hdr_intrusive_moirqueue_dhp.cpp
index a447573b..64602fe2 100644
--- a/tests/test-hdr/queue/hdr_intrusive_moirqueue_dhp.cpp
+++ b/tests/test-hdr/queue/hdr_intrusive_moirqueue_dhp.cpp
@@ -86,18 +86,18 @@ namespace queue {
             >::type
         > MoirQueue_DHP_member_stat;
 
-        // DHP base hook + alignment
+        // DHP base hook + padding
         typedef ci::MoirQueue< cds::gc::DHP, 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::DHP> >
             >
-            , co::alignment< 32 >
+            , co::padding< 32 >
             >::type
         > MoirQueue_DHP_base_align;
 
-        // DHP member hook + alignment
+        // DHP member hook + padding
         typedef ci::MoirQueue< cds::gc::DHP, member_item_type,
             typename ci::msqueue::make_traits<
             ci::opt::hook<
@@ -106,42 +106,42 @@ namespace queue {
             ci::opt::gc<cds::gc::DHP>
             >
             >
-            , co::alignment< 32 >
+            , co::padding< 32 >
             , ci::opt::disposer< IntrusiveQueueHeaderTest::faked_disposer >
             >::type
         > MoirQueue_DHP_member_align;
 
-        // DHP base hook + no alignment
+        // DHP base hook + no padding
         struct traits_MoirQueue_DHP_base_noalign : public ci::msqueue::traits {
             typedef ci::msqueue::base_hook< ci::opt::gc<cds::gc::DHP> > hook;
             typedef IntrusiveQueueHeaderTest::faked_disposer disposer;
-            enum { alignment = co::no_special_alignment };
+            enum { padding = co::no_special_padding };
         };
         typedef ci::MoirQueue< cds::gc::DHP, base_item_type, traits_MoirQueue_DHP_base_noalign > MoirQueue_DHP_base_noalign;
 
-        // DHP member hook + no alignment
+        // DHP member hook + no padding
         struct traits_MoirQueue_DHP_member_noalign : public ci::msqueue::traits {
             typedef ci::msqueue::member_hook <
                 offsetof( member_item_type, hMember ),
                 ci::opt::gc < cds::gc::DHP >
             > hook;
             typedef IntrusiveQueueHeaderTest::faked_disposer disposer;
-            enum { alignment = co::no_special_alignment };
+            enum { padding = co::no_special_padding };
         };
         typedef ci::MoirQueue< cds::gc::DHP, member_item_type, traits_MoirQueue_DHP_member_noalign > MoirQueue_DHP_member_noalign;
 
 
-        // DHP base hook + cache alignment
+        // DHP base hook + cache padding
         struct traits_MoirQueue_DHP_base_cachealign : public traits_MoirQueue_DHP_base_noalign
         {
-            enum { alignment = co::cache_line_alignment };
+            enum { padding = co::cache_line_padding };
         };
         typedef ci::MoirQueue< cds::gc::DHP, base_item_type, traits_MoirQueue_DHP_base_cachealign > MoirQueue_DHP_base_cachealign;
 
-        // DHP member hook + cache alignment
+        // DHP member hook + cache padding
         struct traits_MoirQueue_DHP_member_cachealign : public traits_MoirQueue_DHP_member_noalign
         {
-            enum { alignment = co::cache_line_alignment };
+            enum { padding = co::cache_line_padding };
         };
         typedef ci::MoirQueue< cds::gc::DHP, member_item_type, traits_MoirQueue_DHP_member_cachealign > MoirQueue_DHP_member_cachealign;
     }   // namespace