Remove cds/detail/functor_wrapper.h

diff --git a/cds/container/ellen_bintree_map_rcu.h b/cds/container/ellen_bintree_map_rcu.h
index 3ac34c433f083e9abd7e3a78e466f6eb730954f6..471708babce6d7228a9a44c99ee68050824866f3 100644 (file)
--- a/cds/container/ellen_bintree_map_rcu.h
+++ b/cds/container/ellen_bintree_map_rcu.h
@@ -5,7 +5,6 @@
 
 #include <cds/container/details/ellen_bintree_base.h>
 #include <cds/intrusive/ellen_bintree_rcu.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/impl/ellen_bintree_map.h b/cds/container/impl/ellen_bintree_map.h
index e3e35ce18bdb7f5dcd869d55f85748b9ac4ef4ee..47d3e625504431c7a49891081a766938e1394164 100644 (file)
--- a/cds/container/impl/ellen_bintree_map.h
+++ b/cds/container/impl/ellen_bintree_map.h
@@ -6,7 +6,6 @@
 #include <type_traits>
 #include <cds/container/details/ellen_bintree_base.h>
 #include <cds/intrusive/impl/ellen_bintree.h>
-#include <cds/details/functor_wrapper.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/impl/lazy_kvlist.h b/cds/container/impl/lazy_kvlist.h
index 3fc36447e97252f1b6cb79e194225f5dd172cfe6..6bd64468dd95c7c6441d5a3e9955048d93a1d4c4 100644 (file)
--- a/cds/container/impl/lazy_kvlist.h
+++ b/cds/container/impl/lazy_kvlist.h
@@ -5,7 +5,6 @@
 
 #include <memory>
 #include <functional>   // ref
-#include <cds/details/functor_wrapper.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/impl/michael_kvlist.h b/cds/container/impl/michael_kvlist.h
index cd50086f76b8ea0ae4752390ed0f1fb40dea4834..8621b6f430207a64a61824bfb99fad7ec2ea1840 100644 (file)
--- a/cds/container/impl/michael_kvlist.h
+++ b/cds/container/impl/michael_kvlist.h
@@ -5,7 +5,6 @@
 
 #include <memory>
 #include <functional>   // ref
-#include <cds/details/functor_wrapper.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/impl/skip_list_map.h b/cds/container/impl/skip_list_map.h
index 6ad9a185c37b58195fdde370e08e2bc64a8f50bc..841d6d79a927117b1bc45730e9183a715de63a54 100644 (file)
--- a/cds/container/impl/skip_list_map.h
+++ b/cds/container/impl/skip_list_map.h
@@ -3,7 +3,6 @@
 #ifndef __CDS_CONTAINER_IMPL_SKIP_LIST_MAP_H
 #define __CDS_CONTAINER_IMPL_SKIP_LIST_MAP_H
 
-#include <cds/details/functor_wrapper.h>
 #include <cds/gc/guarded_ptr.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 

diff --git a/cds/container/lazy_kvlist_nogc.h b/cds/container/lazy_kvlist_nogc.h
index f698242a452def449b99e21c0e139a8d1416cbc7..ebe65e4c7785189562ce36c7923b1dbb1dd4d3d3 100644 (file)
--- a/cds/container/lazy_kvlist_nogc.h
+++ b/cds/container/lazy_kvlist_nogc.h
@@ -7,7 +7,6 @@
 #include <cds/container/details/lazy_list_base.h>
 #include <cds/intrusive/lazy_list_nogc.h>
 #include <cds/container/details/make_lazy_kvlist.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/lazy_kvlist_rcu.h b/cds/container/lazy_kvlist_rcu.h
index c93b2d395f7ad681950777c4caab62de116a910f..58dd6cc19f5a8e7201e87c51d440b2e083baccf3 100644 (file)
--- a/cds/container/lazy_kvlist_rcu.h
+++ b/cds/container/lazy_kvlist_rcu.h
@@ -8,7 +8,6 @@
 #include <cds/container/details/lazy_list_base.h>
 #include <cds/intrusive/lazy_list_rcu.h>
 #include <cds/container/details/make_lazy_kvlist.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/michael_kvlist_nogc.h b/cds/container/michael_kvlist_nogc.h
index b098279a52b79dfaacc1e425fda82884fb7831e6..26ac7dd0a2ae63a2b0dae84fb8de0c0d22af067f 100644 (file)
--- a/cds/container/michael_kvlist_nogc.h
+++ b/cds/container/michael_kvlist_nogc.h
@@ -7,7 +7,6 @@
 #include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_nogc.h>
 #include <cds/container/details/make_michael_kvlist.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h
index 679c6485d9f20e88ff11d396540792d25fa5eb21..a568cadd6ae9d5f5a2425fda7c6e8dd84644eba7 100644 (file)
--- a/cds/container/michael_kvlist_rcu.h
+++ b/cds/container/michael_kvlist_rcu.h
@@ -8,7 +8,6 @@
 #include <cds/container/details/michael_list_base.h>
 #include <cds/intrusive/michael_list_rcu.h>
 #include <cds/container/details/make_michael_kvlist.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/skip_list_map_rcu.h b/cds/container/skip_list_map_rcu.h
index 213c2fb518a706bfdb703530d2a5085d398a7878..4b98525d68f4b652578a0be2b5f2620f51eb6f46 100644 (file)
--- a/cds/container/skip_list_map_rcu.h
+++ b/cds/container/skip_list_map_rcu.h
@@ -6,7 +6,6 @@
 #include <cds/container/details/skip_list_base.h>
 #include <cds/intrusive/skip_list_rcu.h>
 #include <cds/container/details/make_skip_list_map.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/split_list_set.h b/cds/container/split_list_set.h
index 901067d3302ca2597d297c77456a1de71a82fe7d..1cf94eec814bddcb05e3a6ae0ea27a6c7a52fbd3 100644 (file)
--- a/cds/container/split_list_set.h
+++ b/cds/container/split_list_set.h
@@ -5,7 +5,6 @@
 
 #include <cds/intrusive/split_list.h>
 #include <cds/container/details/make_split_list_set.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/split_list_set_rcu.h b/cds/container/split_list_set_rcu.h
index 4c4fc5927246f4ddaeabc09e5efac1a8a1bfcf87..2ca942ea7f6bf8fc24603a9ee93b33ef079bfd45 100644 (file)
--- a/cds/container/split_list_set_rcu.h
+++ b/cds/container/split_list_set_rcu.h
@@ -5,7 +5,6 @@
 
 #include <cds/intrusive/split_list_rcu.h>
 #include <cds/container/details/make_split_list_set.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/details/functor_wrapper.h b/cds/details/functor_wrapper.h
deleted file mode 100644 (file)
index cb166d3..0000000
--- a/cds/details/functor_wrapper.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_DETAILS_FUNCTOR_WRAPPER_H
-#define __CDS_DETAILS_FUNCTOR_WRAPPER_H
-
-#include <functional>   // ref
-
-//@cond
-namespace cds { namespace details {
-
-    template <typename Functor>
-    struct functor_wrapper
-    {
-    public:
-        functor_wrapper()
-        {}
-
-        functor_wrapper( Functor /*f*/)
-        {}
-
-        Functor get()
-        {
-            return Functor();
-        }
-    };
-
-    template <typename Functor>
-    struct functor_wrapper<Functor&>
-    {
-        Functor&    m_func;
-    public:
-        functor_wrapper( Functor& f)
-        : m_func(f)
-        {}
-
-        Functor& get()
-        {
-            return m_func;
-        }
-    };
-
-    template <typename Functor>
-    struct functor_wrapper< std::reference_wrapper<Functor> >
-    {
-        std::reference_wrapper<Functor>    m_func;
-    public:
-        functor_wrapper( std::reference_wrapper<Functor> f)
-        : m_func(f)
-        {}
-
-        Functor& get()
-        {
-            return m_func.get();
-        }
-    };
-
-    template <typename Result, typename... Args>
-    struct functor_wrapper<Result (*)(Args...)>
-    {
-        typedef Result (* func_ptr)(Args...);
-        typedef Result (& func_ref)(Args...);
-        func_ptr m_func;
-    public:
-        functor_wrapper( func_ptr f )
-            : m_func(f)
-        {}
-
-        func_ref get()
-        {
-            assert( m_func );
-            return *m_func;
-        }
-    };
-}}  // namespace cds::details
-//@endcond
-
-#endif // #ifndef __CDS_DETAILS_FUNCTOR_WRAPPER_H

diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h
index 6815bb7ac0993c575a705a2bda63f138eff8479b..2b42e7634b88eabd799b27118d9f786250963cb0 100644 (file)
--- a/cds/intrusive/cuckoo_set.h
+++ b/cds/intrusive/cuckoo_set.h
@@ -12,7 +12,6 @@
 #include <cds/opt/hash.h>
 #include <cds/lock/array.h>
 #include <cds/os/thread.h>
-#include <cds/details/functor_wrapper.h>
 #include <cds/lock/spinlock.h>
 
 

diff --git a/cds/intrusive/details/split_list_base.h b/cds/intrusive/details/split_list_base.h
index d88efac24dcee36e90fb6e16163cbb6db94add0c..fd98568be5d9a2bc6797dc989b00b800c9caef95 100644 (file)
--- a/cds/intrusive/details/split_list_base.h
+++ b/cds/intrusive/details/split_list_base.h
@@ -8,7 +8,6 @@
 #include <cds/details/allocator.h>
 #include <cds/algo/int_algo.h>
 #include <cds/algo/bitop.h>
-#include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace intrusive {