Fix bugs of last commit

diff --git a/cds/container/striped_map/std_hash_map_std.h b/cds/container/striped_map/std_hash_map_std.h
index 8738c9121900159a653ea4bad8debed770fedde7..30b12d0af57e03772e372f3af4f0b681c8ed9259 100644 (file)
--- a/cds/container/striped_map/std_hash_map_std.h
+++ b/cds/container/striped_map/std_hash_map_std.h
@@ -110,7 +110,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ));
                 if ( res.second )
-                    ::f( const_cast<value_type&>(*res.first) );
+                    f( const_cast<value_type&>(*res.first) );
                 return res.second;
             }
 
@@ -135,7 +135,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Map.find( key_type(key) );
                 if ( it == m_Map.end() )
                     return false;
-                ::f( const_cast<value_type&>(*it) );
+                f( const_cast<value_type&>(*it) );
                 m_Map.erase( it );
                 return true;
             }
@@ -146,7 +146,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Map.find( key_type(val) );
                 if ( it == m_Map.end() )
                     return false;
-                ::f( const_cast<value_type&>(*it), val );
+                f( const_cast<value_type&>(*it), val );
                 return true;
             }
 

diff --git a/cds/container/striped_map/std_hash_map_vc.h b/cds/container/striped_map/std_hash_map_vc.h
index 81360899f6b967495a4233b7ff96bf0d0fdab1d3..902fbd1a99658d138e8f5bdd7a4ce1c6d00f556b 100644 (file)
--- a/cds/container/striped_map/std_hash_map_vc.h
+++ b/cds/container/striped_map/std_hash_map_vc.h
@@ -111,7 +111,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ) );
                 if ( res.second )
-                    ::f( *res.first );
+                    f( *res.first );
                 return res.second;
             }
 
@@ -119,7 +119,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             std::pair<bool, bool> ensure( const Q& val, Func func )
             {
                 std::pair<iterator, bool> res = m_Map.insert( value_type( val, mapped_type() ));
-                ::func( res.second, *res.first );
+                func( res.second, *res.first );
                 return std::make_pair( true, res.second );
             }
 
@@ -129,7 +129,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Map.find( key_type(key) );
                 if ( it == m_Map.end() )
                     return false;
-                ::f( *it );
+                f( *it );
                 m_Map.erase( it );
                 return true;
             }
@@ -140,7 +140,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Map.find( key_type(val) );
                 if ( it == m_Map.end() )
                     return false;
-                ::f( *it, val );
+                f( *it, val );
                 return true;
             }
 

diff --git a/cds/container/striped_map/std_map.h b/cds/container/striped_map/std_map.h
index 6214b588d2bc2029af28754d6b840c9efc753ced..5b67b09013f60e14834bb823678500ec532270a7 100644 (file)
--- a/cds/container/striped_map/std_map.h
+++ b/cds/container/striped_map/std_map.h
@@ -106,7 +106,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ) );
                 if ( res.second )
-                    ::f( *res.first );
+                    f( *res.first );
                 return res.second;
             }
 

diff --git a/cds/container/striped_set/std_hash_set_std.h b/cds/container/striped_set/std_hash_set_std.h
index 72cb3fc1079a68dd23462a9d1614c01916372f8c..66a11ad51c32245df17449fed43b2318fbcb0c76 100644 (file)
--- a/cds/container/striped_set/std_hash_set_std.h
+++ b/cds/container/striped_set/std_hash_set_std.h
@@ -93,7 +93,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
                 if ( res.second )
-                    ::f( const_cast<value_type&>(*res.first) );
+                    f( const_cast<value_type&>(*res.first) );
                 return res.second;
             }
 

diff --git a/cds/container/striped_set/std_hash_set_vc.h b/cds/container/striped_set/std_hash_set_vc.h
index 765a0698538db118e86faba3a64226565d6dcce6..b1ffb60b6302ab7afdf4e714b3a486b984167b79 100644 (file)
--- a/cds/container/striped_set/std_hash_set_vc.h
+++ b/cds/container/striped_set/std_hash_set_vc.h
@@ -95,7 +95,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
                 if ( res.second )
-                    ::f( *res.first );
+                    f( *res.first );
                 return res.second;
             }
 
@@ -103,7 +103,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             std::pair<bool, bool> ensure( const Q& val, Func func )
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
-                ::func( res.second, *res.first, val );
+                func( res.second, *res.first, val );
                 return std::make_pair( true, res.second );
             }
 
@@ -113,7 +113,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Set.find( value_type(key) );
                 if ( it == m_Set.end() )
                     return false;
-                ::f( *it );
+                f( *it );
                 m_Set.erase( it );
                 return true;
             }
@@ -124,7 +124,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Set.find( value_type(val) );
                 if ( it == m_Set.end() )
                     return false;
-                ::f( *it, val );
+                f( *it, val );
                 return true;
             }
 

diff --git a/cds/container/striped_set/std_set.h b/cds/container/striped_set/std_set.h
index b64c5cdcae52fc82b9179b8830f057a76e45a2e3..4e5790911ba3efa5ac7fadf6dea785e9c47561a5 100644 (file)
--- a/cds/container/striped_set/std_set.h
+++ b/cds/container/striped_set/std_set.h
@@ -90,7 +90,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
                 if ( res.second )
-                    ::f( const_cast<value_type&>(*res.first) );
+                    f( const_cast<value_type&>(*res.first) );
                 return res.second;
             }
 
@@ -105,7 +105,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             std::pair<bool, bool> ensure( const Q& val, Func func )
             {
                 std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
-                ::func( res.second, const_cast<value_type&>(*res.first), val );
+                func( res.second, const_cast<value_type&>(*res.first), val );
                 return std::make_pair( true, res.second );
             }
 
@@ -115,7 +115,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Set.find( value_type(key) );
                 if ( it == m_Set.end() )
                     return false;
-                ::f( const_cast<value_type&>(*it) );
+                f( const_cast<value_type&>(*it) );
                 m_Set.erase( it );
                 return true;
             }
@@ -126,7 +126,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 iterator it = m_Set.find( value_type(val) );
                 if ( it == m_Set.end() )
                     return false;
-                ::f( const_cast<value_type&>(*it), val );
+                f( const_cast<value_type&>(*it), val );
                 return true;
             }
 

diff --git a/cds/details/functor_wrapper.h b/cds/details/functor_wrapper.h
index 3ee34fcc24749760b591b3eb9fc491d07c7ec5a3..cb166d31ad48fbe3c333ec7b83ec923344310f02 100644 (file)
--- a/cds/details/functor_wrapper.h
+++ b/cds/details/functor_wrapper.h
@@ -40,11 +40,11 @@ namespace cds { namespace details {
     };
 
     template <typename Functor>
-    struct functor_wrapper< boost::reference_wrapper<Functor> >
+    struct functor_wrapper< std::reference_wrapper<Functor> >
     {
-        boost::reference_wrapper<Functor>    m_func;
+        std::reference_wrapper<Functor>    m_func;
     public:
-        functor_wrapper( boost::reference_wrapper<Functor> f)
+        functor_wrapper( std::reference_wrapper<Functor> f)
         : m_func(f)
         {}
 

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 9a5ab508df232be688a162db97116e704dea4366..471ae9eab3e0358420c2ee57904350e982f6f12c 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -818,7 +818,6 @@
     <ClInclude Include="..\..\..\cds\urcu\signal_threaded.h" />\r
     <ClInclude Include="..\..\..\src\hzp_const.h" />\r
     <ClInclude Include="..\..\..\cds\init.h" />\r
-    <ClInclude Include="..\..\..\cds\ref.h" />\r
     <ClInclude Include="..\..\..\cds\refcounter.h" />\r
     <ClInclude Include="..\..\..\cds\version.h" />\r
     <ClInclude Include="..\..\..\cds\details\aligned_allocator.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 88b2f14d92c22febc0e0a519a2ca19ab0d7d3e04..358e40ba7fa355706be73897c34da01638947046 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -200,9 +200,6 @@
     <ClInclude Include="..\..\..\cds\init.h">\r
       <Filter>Header Files\cds</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\ref.h">\r
-      <Filter>Header Files\cds</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\refcounter.h">\r
       <Filter>Header Files\cds</Filter>\r
     </ClInclude>\r