From: khizmax Date: Wed, 13 Apr 2016 20:34:27 +0000 (+0300) Subject: Fixed GCC incompatibility X-Git-Tag: v2.2.0~279 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=72c1b793fcbe0c2bd77f40a1ed29fc822904fdc6;hp=c6e21c5e4b79756aceceb8f33a6a5847a2d9cc16 Fixed GCC incompatibility --- diff --git a/test/unit/tree/test_intrusive_ellen_bintree_rcu.h b/test/unit/tree/test_intrusive_ellen_bintree_rcu.h index b5fdd2e9..d9038e40 100644 --- a/test/unit/tree/test_intrusive_ellen_bintree_rcu.h +++ b/test/unit/tree/test_intrusive_ellen_bintree_rcu.h @@ -147,7 +147,7 @@ namespace { typedef typename TestFixture::generic_traits generic_traits; typedef ci::EllenBinTree< rcu_type, key_type, base_item_type, - ci::ellen_bintree::make_traits< + typename ci::ellen_bintree::make_traits< ci::opt::type_traits< generic_traits > , ci::opt::hook< ci::ellen_bintree::base_hook< ci::opt::gc< rcu_type >>> , ci::opt::compare< typename TestFixture::template cmp> @@ -166,7 +166,7 @@ namespace { typedef typename TestFixture::generic_traits generic_traits; typedef ci::EllenBinTree< rcu_type, key_type, base_item_type, - ci::ellen_bintree::make_traits< + typename ci::ellen_bintree::make_traits< ci::opt::type_traits< generic_traits > , ci::opt::hook< ci::ellen_bintree::base_hook< ci::opt::gc< rcu_type >>> , ci::opt::less< typename TestFixture::template less> @@ -185,7 +185,7 @@ namespace { typedef typename TestFixture::generic_traits generic_traits; typedef ci::EllenBinTree< rcu_type, key_type, base_item_type, - ci::ellen_bintree::make_traits< + typename ci::ellen_bintree::make_traits< ci::opt::type_traits< generic_traits > , ci::opt::hook< ci::ellen_bintree::base_hook< ci::opt::gc< rcu_type >>> , ci::opt::compare< typename TestFixture::template cmp> @@ -293,7 +293,7 @@ namespace { typedef typename TestFixture::generic_traits generic_traits; typedef ci::EllenBinTree< rcu_type, key_type, member_item_type, - ci::ellen_bintree::make_traits< + typename ci::ellen_bintree::make_traits< ci::opt::type_traits< generic_traits > , ci::opt::hook< ci::ellen_bintree::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >>> , ci::opt::compare< typename TestFixture::template cmp> @@ -312,7 +312,7 @@ namespace { typedef typename TestFixture::generic_traits generic_traits; typedef ci::EllenBinTree< rcu_type, key_type, member_item_type, - ci::ellen_bintree::make_traits< + typename ci::ellen_bintree::make_traits< ci::opt::type_traits< generic_traits > , ci::opt::hook< ci::ellen_bintree::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >>> , ci::opt::less< typename TestFixture::template less> @@ -331,7 +331,7 @@ namespace { typedef typename TestFixture::generic_traits generic_traits; typedef ci::EllenBinTree< rcu_type, key_type, member_item_type, - ci::ellen_bintree::make_traits< + typename ci::ellen_bintree::make_traits< ci::opt::type_traits< generic_traits > , ci::opt::hook< ci::ellen_bintree::member_hook< offsetof( member_item_type, hMember ), ci::opt::gc< rcu_type >>> , ci::opt::compare< typename TestFixture::template cmp>