X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Funit%2Fintrusive-set%2Ftest_intrusive_michael_michael_rcu.h;h=5d9e3ee70a659347020e1b29f22bfda8e9069233;hb=6924946ceeaae28bc227fe7c9d8e939963bb9d69;hp=1c3873171fa3246be1c0059d08cc929a466e09ef;hpb=49c0aa6b50ba412f206f06419adf1bf2213ae373;p=libcds.git

diff --git a/test/unit/intrusive-set/test_intrusive_michael_michael_rcu.h b/test/unit/intrusive-set/test_intrusive_michael_michael_rcu.h
index 1c387317..5d9e3ee7 100644
--- a/test/unit/intrusive-set/test_intrusive_michael_michael_rcu.h
+++ b/test/unit/intrusive-set/test_intrusive_michael_michael_rcu.h
@@ -66,14 +66,14 @@ TYPED_TEST_P( IntrusiveMichaelSet, base_cmp )
     typedef typename TestFixture::rcu_type rcu_type;
     typedef typename TestFixture::base_item_type base_item_type;
     typedef typename TestFixture::mock_disposer mock_disposer;
-    typedef typename TestFixture::template cmp<base_item_type> cmp;
+    typedef typename TestFixture::template cmp<base_item_type> item_cmp;
     typedef typename TestFixture::hash_int hash_int;
 
     typedef ci::MichaelList< rcu_type
         , base_item_type
         , typename ci::michael_list::make_traits<
             ci::opt::hook< ci::michael_list::base_hook< ci::opt::gc< rcu_type > > >
-            , ci::opt::compare< cmp >
+            , ci::opt::compare< item_cmp >
             , ci::opt::disposer< mock_disposer >
         >::type
     > bucket_type;
@@ -93,14 +93,14 @@ TYPED_TEST_P( IntrusiveMichaelSet, base_less )
     typedef typename TestFixture::rcu_type rcu_type;
     typedef typename TestFixture::base_item_type base_item_type;
     typedef typename TestFixture::mock_disposer mock_disposer;
-    typedef typename TestFixture::template less<base_item_type> less;
+    typedef typename TestFixture::template less<base_item_type> item_less;
     typedef typename TestFixture::hash_int hash_int;
 
     typedef ci::MichaelList< rcu_type
         , base_item_type
         , typename ci::michael_list::make_traits<
             ci::opt::hook< ci::michael_list::base_hook< ci::opt::gc< rcu_type >>>
-            , ci::opt::less< less >
+            , ci::opt::less< item_less >
             , ci::opt::disposer< mock_disposer >
         >::type
     > bucket_type;
@@ -205,7 +205,7 @@ TYPED_TEST_P( IntrusiveMichaelSet, member_cmp )
     typedef typename TestFixture::rcu_type rcu_type;
     typedef typename TestFixture::member_item_type member_item_type;
     typedef typename TestFixture::mock_disposer mock_disposer;
-    typedef typename TestFixture::template cmp<member_item_type> cmp;
+    typedef typename TestFixture::template cmp<member_item_type> item_cmp;
     typedef typename TestFixture::hash_int hash_int;
 
     typedef ci::MichaelList< rcu_type
@@ -215,7 +215,7 @@ TYPED_TEST_P( IntrusiveMichaelSet, member_cmp )
                 offsetof( member_item_type, hMember ),
                 ci::opt::gc<rcu_type>
             >>
-            , ci::opt::compare< cmp >
+            , ci::opt::compare< item_cmp >
             , ci::opt::disposer< mock_disposer >
         >::type
     >    bucket_type;
@@ -235,7 +235,7 @@ TYPED_TEST_P( IntrusiveMichaelSet, member_less )
     typedef typename TestFixture::rcu_type rcu_type;
     typedef typename TestFixture::member_item_type member_item_type;
     typedef typename TestFixture::mock_disposer mock_disposer;
-    typedef typename TestFixture::template less<member_item_type> less;
+    typedef typename TestFixture::template less<member_item_type> item_less;
     typedef typename TestFixture::hash_int hash_int;
 
     typedef ci::MichaelList< rcu_type
@@ -245,7 +245,7 @@ TYPED_TEST_P( IntrusiveMichaelSet, member_less )
                 offsetof( member_item_type, hMember ),
                 ci::opt::gc<rcu_type>
             > >
-            , ci::opt::less< less >
+            , ci::opt::less< item_less >
             , ci::opt::disposer< mock_disposer >
         >::type
     > bucket_type;