Remove cds/details/std/memory.h, use STL <memory> instead

diff --git a/cds/container/basket_queue.h b/cds/container/basket_queue.h
index 991b3cb352badf3ca588b81a51b0c499dfa514bd..b0425e0ac398dc8181a60db8f2cb885e5bc8461f 100644 (file)
--- a/cds/container/basket_queue.h
+++ b/cds/container/basket_queue.h
@@ -3,11 +3,12 @@
 #ifndef __CDS_CONTAINER_BASKET_QUEUE_H
 #define __CDS_CONTAINER_BASKET_QUEUE_H
 
+#include <memory>
 #include <cds/intrusive/basket_queue.h>
 #include <cds/container/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
+
 
 namespace cds { namespace container {
 

diff --git a/cds/container/lazy_kvlist_impl.h b/cds/container/lazy_kvlist_impl.h
index 4b09260f73fea9e1f9e03a112c46b6e4f34eed5e..97a53e549b41c25b5a5d1b42021d6ffdef413f46 100644 (file)
--- a/cds/container/lazy_kvlist_impl.h
+++ b/cds/container/lazy_kvlist_impl.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_LAZY_KVLIST_IMPL_H
 #define __CDS_CONTAINER_LAZY_KVLIST_IMPL_H
 
+#include <memory>
 #include <cds/ref.h>
 #include <cds/details/functor_wrapper.h>
-#include <cds/details/std/memory.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/lazy_kvlist_nogc.h b/cds/container/lazy_kvlist_nogc.h
index 5b8b5c4fec61b652866b1460f5613f62b0d0185e..0d7017da9033129ed13dba9645dfaf6cc188b310 100644 (file)
--- a/cds/container/lazy_kvlist_nogc.h
+++ b/cds/container/lazy_kvlist_nogc.h
@@ -3,11 +3,11 @@
 #ifndef __CDS_CONTAINER_LAZY_KVLIST_NOGC_H
 #define __CDS_CONTAINER_LAZY_KVLIST_NOGC_H
 
+#include <memory>
 #include <cds/container/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>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/lazy_kvlist_rcu.h b/cds/container/lazy_kvlist_rcu.h
index dcc9de862dbe004c3cc56c30ce01d1e2bbcd2b30..266cb5c1743398363def5465511dfa9b360adf2b 100644 (file)
--- a/cds/container/lazy_kvlist_rcu.h
+++ b/cds/container/lazy_kvlist_rcu.h
@@ -3,12 +3,12 @@
 #ifndef __CDS_CONTAINER_LAZY_KVLIST_RCU_H
 #define __CDS_CONTAINER_LAZY_KVLIST_RCU_H
 
+#include <memory>
 #include <cds/container/lazy_list_base.h>
 #include <cds/intrusive/lazy_list_rcu.h>
 #include <cds/container/details/make_lazy_kvlist.h>
 #include <cds/ref.h>
 #include <cds/details/functor_wrapper.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/lazy_list_impl.h b/cds/container/lazy_list_impl.h
index 8b675db375e11387cac9c29368194a25d0b67dbb..1ed6fcb0e9a3505290f1f623637dc7ceee7d796e 100644 (file)
--- a/cds/container/lazy_list_impl.h
+++ b/cds/container/lazy_list_impl.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_LAZY_LIST_IMPL_H
 #define __CDS_CONTAINER_LAZY_LIST_IMPL_H
 
-#include <cds/details/std/memory.h>
+#include <memory>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/lazy_list_nogc.h b/cds/container/lazy_list_nogc.h
index 642931abba0e0a9afb48e49ddad500a98eccc5e7..5c08d1f83592faec9f45d0dbea03de6d999d7abe 100644 (file)
--- a/cds/container/lazy_list_nogc.h
+++ b/cds/container/lazy_list_nogc.h
@@ -3,10 +3,10 @@
 #ifndef __CDS_CONTAINER_LAZY_LIST_NOGC_H
 #define __CDS_CONTAINER_LAZY_LIST_NOGC_H
 
+#include <memory>
 #include <cds/container/lazy_list_base.h>
 #include <cds/intrusive/lazy_list_nogc.h>
 #include <cds/container/details/make_lazy_list.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/lazy_list_rcu.h b/cds/container/lazy_list_rcu.h
index f93d2d5cd51b17fdb11680edc07cc365df21c1dc..77dfe4167739e1840a9416b9c628c6a2c919b01d 100644 (file)
--- a/cds/container/lazy_list_rcu.h
+++ b/cds/container/lazy_list_rcu.h
@@ -3,10 +3,10 @@
 #ifndef __CDS_CONTAINER_LAZY_LIST_RCU_H
 #define __CDS_CONTAINER_LAZY_LIST_RCU_H
 
+#include <memory>
 #include <cds/container/lazy_list_base.h>
 #include <cds/intrusive/lazy_list_rcu.h>
 #include <cds/details/binary_functor_wrapper.h>
-#include <cds/details/std/memory.h>
 #include <cds/container/details/make_lazy_list.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/michael_deque.h b/cds/container/michael_deque.h
index da9b7cb89e7957ee1b005faa836e08f949101df4..7cac646231116b4ed64b349df4ba6d25b00da3de 100644 (file)
--- a/cds/container/michael_deque.h
+++ b/cds/container/michael_deque.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_MICHAEL_DEQUE_H
 #define __CDS_CONTAINER_MICHAEL_DEQUE_H
 
+#include <memory>
 #include <cds/intrusive/michael_deque.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/michael_kvlist_impl.h b/cds/container/michael_kvlist_impl.h
index f67727a6b3826922c75a17ea012c583c7267c91d..9aa13cfc5a1e612e46467ce121146b8a95a9d945 100644 (file)
--- a/cds/container/michael_kvlist_impl.h
+++ b/cds/container/michael_kvlist_impl.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_IMPL_H
 #define __CDS_CONTAINER_MICHAEL_KVLIST_IMPL_H
 
+#include <memory>
 #include <cds/ref.h>
 #include <cds/details/functor_wrapper.h>
-#include <cds/details/std/memory.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/michael_kvlist_nogc.h b/cds/container/michael_kvlist_nogc.h
index 33a5017c5fab1e13fd2adc16d748800eca9eed60..01c2da0750a1756c1bb097a4190bf9ccbc3ae17b 100644 (file)
--- a/cds/container/michael_kvlist_nogc.h
+++ b/cds/container/michael_kvlist_nogc.h
@@ -3,11 +3,11 @@
 #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_NOGC_H
 #define __CDS_CONTAINER_MICHAEL_KVLIST_NOGC_H
 
+#include <memory>
 #include <cds/container/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>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h
index 1092ed16feca460ed24054fdb0e5d00cca9d04db..06b69e632f7c03ae03e61588670aa92b409a095d 100644 (file)
--- a/cds/container/michael_kvlist_rcu.h
+++ b/cds/container/michael_kvlist_rcu.h
@@ -3,12 +3,12 @@
 #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_RCU_H
 #define __CDS_CONTAINER_MICHAEL_KVLIST_RCU_H
 
+#include <memory>
 #include <cds/container/michael_list_base.h>
 #include <cds/intrusive/michael_list_rcu.h>
 #include <cds/container/details/make_michael_kvlist.h>
 #include <cds/ref.h>
 #include <cds/details/functor_wrapper.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/michael_list_impl.h b/cds/container/michael_list_impl.h
index 739bbc58c48c85eeb2f76fa264a2fee7aa8636e8..ccec178ad5d9c6a5ed256c5c255901da32d2d2bc 100644 (file)
--- a/cds/container/michael_list_impl.h
+++ b/cds/container/michael_list_impl.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_IMPL_H
 #define __CDS_CONTAINER_MICHAEL_LIST_IMPL_H
 
-#include <cds/details/std/memory.h>
+#include <memory>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/michael_list_nogc.h b/cds/container/michael_list_nogc.h
index ed02c4e6d6773b9565ae5e20c0c87f11441cd57d..e18a10da66463bd417deae2194999fc5d06c90d1 100644 (file)
--- a/cds/container/michael_list_nogc.h
+++ b/cds/container/michael_list_nogc.h
@@ -3,10 +3,10 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_NOGC_H
 #define __CDS_CONTAINER_MICHAEL_LIST_NOGC_H
 
+#include <memory>
 #include <cds/container/michael_list_base.h>
 #include <cds/intrusive/michael_list_nogc.h>
 #include <cds/container/details/make_michael_list.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/michael_list_rcu.h b/cds/container/michael_list_rcu.h
index 91295e1a080c5ed970ac7e41fa5dc1bbf7978773..9a46b0003c127234742c27dddcf917cd6cffec3b 100644 (file)
--- a/cds/container/michael_list_rcu.h
+++ b/cds/container/michael_list_rcu.h
@@ -3,11 +3,11 @@
 #ifndef __CDS_CONTAINER_MICHAEL_LIST_RCU_H
 #define __CDS_CONTAINER_MICHAEL_LIST_RCU_H
 
+#include <memory>
 #include <cds/container/michael_list_base.h>
 #include <cds/intrusive/michael_list_rcu.h>
 #include <cds/container/details/make_michael_list.h>
 #include <cds/details/binary_functor_wrapper.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/moir_queue.h b/cds/container/moir_queue.h
index fba297738565fed164ecf10e2569b41efba83326..5f881eacc06f1ae74efc86d69c96926f6605c874 100644 (file)
--- a/cds/container/moir_queue.h
+++ b/cds/container/moir_queue.h
@@ -3,12 +3,12 @@
 #ifndef __CDS_CONTAINER_MOIR_QUEUE_H
 #define __CDS_CONTAINER_MOIR_QUEUE_H
 
+#include <memory>
 #include <cds/intrusive/moir_queue.h>
 #include <cds/intrusive/queue_stat.h>
 #include <cds/container/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/mspriority_queue.h b/cds/container/mspriority_queue.h
index 2f83b5a3a6950750efde6c772bac29ffb7e1ca58..a451b4cd5ced6725e6c8331c2d35687c398301a6 100644 (file)
--- a/cds/container/mspriority_queue.h
+++ b/cds/container/mspriority_queue.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_MSPRIORITY_QUEUE_H
 #define __CDS_CONTAINER_MSPRIORITY_QUEUE_H
 
+#include <memory>
 #include <cds/container/base.h>
 #include <cds/intrusive/mspriority_queue.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/msqueue.h b/cds/container/msqueue.h
index 29c33553b89b9fc0b10b1b30d595a967c16ca80d..a6ecd6c259353d9f49cf8b7bc1c63b66391db662 100644 (file)
--- a/cds/container/msqueue.h
+++ b/cds/container/msqueue.h
@@ -3,11 +3,11 @@
 #ifndef __CDS_CONTAINER_MSQUEUE_H
 #define __CDS_CONTAINER_MSQUEUE_H
 
+#include <memory>
 #include <cds/intrusive/msqueue.h>
 #include <cds/container/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/optimistic_queue.h b/cds/container/optimistic_queue.h
index ca92861a34c4b769a576988cd816f6c49ff8e6eb..f9faeadeceaaa36bf96ba5063a841be040a82049 100644 (file)
--- a/cds/container/optimistic_queue.h
+++ b/cds/container/optimistic_queue.h
@@ -3,11 +3,11 @@
 #ifndef __CDS_CONTAINER_OPTIMISTIC_QUEUE_H
 #define __CDS_CONTAINER_OPTIMISTIC_QUEUE_H
 
+#include <memory>
 #include <cds/intrusive/optimistic_queue.h>
 #include <cds/container/base.h>
 #include <cds/ref.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/rwqueue.h b/cds/container/rwqueue.h
index e2c66b8c7c201b585bd39e33a2aa7e89dd4397e2..754ec3ed022705ef6cc3f99831dd5c08acb391cd 100644 (file)
--- a/cds/container/rwqueue.h
+++ b/cds/container/rwqueue.h
@@ -3,12 +3,12 @@
 #ifndef __CDS_CONTAINER_RWQUEUE_H
 #define __CDS_CONTAINER_RWQUEUE_H
 
+#include <memory>
 #include <cds/opt/options.h>
 #include <cds/lock/spinlock.h>
 #include <cds/intrusive/queue_stat.h>
 #include <cds/details/allocator.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 #include <cds/ref.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/segmented_queue.h b/cds/container/segmented_queue.h
index 45b894beaa2f05d29b6b7e036983afb34140257a..3026019c8f32fccf496812e751dbaae4843accc2 100644 (file)
--- a/cds/container/segmented_queue.h
+++ b/cds/container/segmented_queue.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_SEGMENTED_QUEUE_H
 #define __CDS_CONTAINER_SEGMENTED_QUEUE_H
 
+#include <memory>
 #include <cds/intrusive/segmented_queue.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 #include <cds/ref.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/treiber_stack.h b/cds/container/treiber_stack.h
index 63d0e860493ca43a3eb313c5c328b56187164365..0360ad9e82205d681326acb28c74b9c54d9d7d0a 100644 (file)
--- a/cds/container/treiber_stack.h
+++ b/cds/container/treiber_stack.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_TREIBER_STACK_H
 #define __CDS_CONTAINER_TREIBER_STACK_H
 
+#include <memory>
 #include <cds/intrusive/treiber_stack.h>
 #include <cds/container/base.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/container/tsigas_cycle_queue.h b/cds/container/tsigas_cycle_queue.h
index 7ea351a79a663e3f49ec3cb2cdd91bd0c67b9541..0e90505034563c10833cf7392e4112647e944087 100644 (file)
--- a/cds/container/tsigas_cycle_queue.h
+++ b/cds/container/tsigas_cycle_queue.h
@@ -3,10 +3,10 @@
 #ifndef __CDS_CONTAINER_TSIGAS_CYCLE_QUEUE_H
 #define __CDS_CONTAINER_TSIGAS_CYCLE_QUEUE_H
 
+#include <memory>
 #include <cds/intrusive/tsigas_cycle_queue.h>
 #include <cds/container/base.h>
 #include <cds/details/trivial_assign.h>
-#include <cds/details/std/memory.h>
 
 namespace cds { namespace container {
 

diff --git a/cds/details/std/memory.h b/cds/details/std/memory.h
deleted file mode 100644 (file)
index 8c0682e..0000000
--- a/cds/details/std/memory.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//$$CDS-header$$
-
-//@cond
-#ifndef __CDS_DETAILS_STD_MEMORY_H
-#define __CDS_DETAILS_STD_MEMORY_H
-
-#include <cds/details/defs.h>
-#include <memory>
-
-// -----------------------------------------------------------------
-// std::unique_ptr
-
-#if ((CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500) \
-    || (CDS_COMPILER == CDS_COMPILER_GCC && CDS_COMPILER_VERSION < 40400 )
-// MS VC 2008, GCC 4.3
-
-namespace std {
-    template <class T> struct default_delete {
-        default_delete()
-        {}
-        void operator()(T* p) const
-        {
-            delete p;
-        }
-    };
-
-    template <typename T, typename Deleter = default_delete<T> >
-    class unique_ptr: private auto_ptr<T>
-    {
-        typedef auto_ptr<T> base_class;
-
-        // copy ctor is deleted
-        template <typename Q, typename D> unique_ptr( unique_ptr<Q, D> const& s );
-
-    public:
-        unique_ptr() throw()
-        {}
-
-        explicit unique_ptr( T * p ) throw()
-            : base_class( p )
-        {}
-
-        ~unique_ptr()
-        {
-            T * p = release();
-            if ( p )
-                Deleter()( p );
-        }
-
-        T * operator ->() const throw()
-        {
-            return base_class::operator->();
-        }
-
-        T& operator *() throw()
-        {
-            return base_class::operator*();
-        }
-
-        unique_ptr& operator=( T * p )
-        {
-            base_class::operator=(p);
-            return *this;
-        }
-
-        T * get() const throw()
-        {
-            return base_class::get();
-        }
-
-        T * release() throw()
-        {
-            return base_class::release();
-        }
-
-        void reset( T * p )
-        {
-            T * pOld = release();
-            assert( p != pOld );
-            if ( pOld )
-                Deleter()( pOld );
-            base_class::reset( p );
-        }
-    };
-}
-
-#endif
-// -----------------------------------------------------------------
-// std::shared_ptr
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-// MS VC 2008
-
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
-namespace std {
-    using boost::shared_ptr;
-    using boost::make_shared;
-    using boost::allocate_shared;
-    using boost::enable_shared_from_this;
-}   // namespace std
-#endif
-
-
-#endif // #ifndef __CDS_DETAILS_STD_MEMORY_H
-//@endcond

diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h
index b6196c3becbeca74a04acca7fc3a16484bc08ed8..3a36a98acb2ed19fe81cce5da646334c77ab19ea 100644 (file)
--- a/cds/intrusive/cuckoo_set.h
+++ b/cds/intrusive/cuckoo_set.h
@@ -3,6 +3,7 @@
 #ifndef __CDS_INTRUSIVE_CUCKOO_SET_H
 #define __CDS_INTRUSIVE_CUCKOO_SET_H
 
+#include <memory>
 #include <type_traits>
 #include <cds/intrusive/base.h>
 #include <cds/opt/compare.h>
@@ -10,7 +11,6 @@
 #include <cds/lock/array.h>
 #include <cds/ref.h>
 #include <cds/os/thread.h>
-#include <cds/details/std/memory.h>
 #include <cds/details/functor_wrapper.h>
 #include <cds/lock/spinlock.h>
 

diff --git a/cds/intrusive/ellen_bintree_impl.h b/cds/intrusive/ellen_bintree_impl.h
index 5bfdd0a02ec2c87ee72a53341b0f2b5c90f1d248..f4890a8dc2c9056586eadab069fe083a88f6cf88 100644 (file)
--- a/cds/intrusive/ellen_bintree_impl.h
+++ b/cds/intrusive/ellen_bintree_impl.h
@@ -3,12 +3,12 @@
 #ifndef __CDS_INTRUSIVE_ELLEN_BINTREE_IMPL_H
 #define __CDS_INTRUSIVE_ELLEN_BINTREE_IMPL_H
 
+#include <memory>
 #include <cds/intrusive/details/ellen_bintree_base.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/details/binary_functor_wrapper.h>
 #include <cds/urcu/details/check_deadlock.h>
-#include <cds/details/std/memory.h>
 #include <cds/gc/guarded_ptr.h>
 
 namespace cds { namespace intrusive {

diff --git a/cds/intrusive/ellen_bintree_rcu.h b/cds/intrusive/ellen_bintree_rcu.h
index eac4ee062ab05d2770c91b6e735d311c3b869694..5d9c35b6699f30886cd8b8cc1780bff308452956 100644 (file)
--- a/cds/intrusive/ellen_bintree_rcu.h
+++ b/cds/intrusive/ellen_bintree_rcu.h
@@ -3,12 +3,12 @@
 #ifndef __CDS_INTRUSIVE_ELLEN_BINTREE_RCU_H
 #define __CDS_INTRUSIVE_ELLEN_BINTREE_RCU_H
 
+#include <memory>
 #include <cds/intrusive/details/ellen_bintree_base.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/details/binary_functor_wrapper.h>
 #include <cds/urcu/details/check_deadlock.h>
-#include <cds/details/std/memory.h>
 #include <cds/urcu/exempt_ptr.h>
 
 namespace cds { namespace intrusive {

diff --git a/cds/intrusive/skip_list_impl.h b/cds/intrusive/skip_list_impl.h
index 9822023a0c3a6ad3e226c256453f4eca8c93951c..a2c19d251ddc17c63b90d84d27264d5a97bfa520 100644 (file)
--- a/cds/intrusive/skip_list_impl.h
+++ b/cds/intrusive/skip_list_impl.h
@@ -4,8 +4,8 @@
 #define __CDS_INTRUSIVE_SKIP_LIST_IMPL_H
 
 #include <type_traits>
+#include <memory>
 #include <cds/intrusive/skip_list_base.h>
-#include <cds/details/std/memory.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/details/binary_functor_wrapper.h>

diff --git a/cds/intrusive/skip_list_nogc.h b/cds/intrusive/skip_list_nogc.h
index da524bdc88905b7fa78366b22e3405ab6b37242f..112e1b278d5afc99631b559c2fc4e6bc7855dd20 100644 (file)
--- a/cds/intrusive/skip_list_nogc.h
+++ b/cds/intrusive/skip_list_nogc.h
@@ -4,9 +4,9 @@
 #define __CDS_INTRUSIVE_SKIP_LIST_NOGC_H
 
 #include <type_traits>
+#include <memory>
 #include <cds/gc/nogc.h>
 #include <cds/intrusive/skip_list_base.h>
-#include <cds/details/std/memory.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/details/binary_functor_wrapper.h>

diff --git a/cds/intrusive/skip_list_rcu.h b/cds/intrusive/skip_list_rcu.h
index 07975ec90fca4a78ff4022fe0e224c8c873b681b..d6d08839eba87562a57c9c12696c9b93cd031b12 100644 (file)
--- a/cds/intrusive/skip_list_rcu.h
+++ b/cds/intrusive/skip_list_rcu.h
@@ -4,8 +4,8 @@
 #define __CDS_INTRUSIVE_SKIP_LIST_RCU_H
 
 #include <type_traits>
+#include <memory>
 #include <cds/intrusive/skip_list_base.h>
-#include <cds/details/std/memory.h>
 #include <cds/opt/compare.h>
 #include <cds/ref.h>
 #include <cds/urcu/details/check_deadlock.h>

diff --git a/cds/intrusive/striped_set/striping_policy.h b/cds/intrusive/striped_set/striping_policy.h
index 881d2cf4b1cd2e88954172634b44aee10c2e3e1a..579563c01661d1027bcd6ba68f4f194e08935029 100644 (file)
--- a/cds/intrusive/striped_set/striping_policy.h
+++ b/cds/intrusive/striped_set/striping_policy.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_INTRUSIVE_STRIPED_SET_STRIPING_POLICY_H
 #define __CDS_INTRUSIVE_STRIPED_SET_STRIPING_POLICY_H
 
+#include <memory>
 #include <cds/lock/array.h>
 #include <cds/os/thread.h>
-#include <cds/details/std/memory.h>
 #include <cds/lock/spinlock.h>
 
 #include <cds/details/std/mutex.h>

diff --git a/cds/memory/michael/bound_check.h b/cds/memory/michael/bound_check.h
index 46f9f9da0cce7220d807acf66ec8d409df138dcc..02cc7bc0b909339b3fa93e08ca3d093cde6f2e0f 100644 (file)
--- a/cds/memory/michael/bound_check.h
+++ b/cds/memory/michael/bound_check.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_MEMORY_MICHAEL_ALLOCATOR_BOUND_CHECK_H
 #define __CDS_MEMORY_MICHAEL_ALLOCATOR_BOUND_CHECK_H
 
-#include <cds/opt/options.h>
 #include <exception>
 #include <memory.h>
+#include <cds/opt/options.h>
 
 namespace cds { namespace memory { namespace michael {
 

diff --git a/cds/urcu/dispose_thread.h b/cds/urcu/dispose_thread.h
index 5a8686fbd6b01d463e26e3abbcf827f034841cca..acad1b44148cfe7cf226c839822f127d9260183e 100644 (file)
--- a/cds/urcu/dispose_thread.h
+++ b/cds/urcu/dispose_thread.h
@@ -3,10 +3,10 @@
 #ifndef _CDS_URCU_DISPOSE_THREAD_H
 #define _CDS_URCU_DISPOSE_THREAD_H
 
+#include <memory>
 #include <cds/details/std/thread.h>
 #include <cds/details/std/mutex.h>
 #include <cds/details/std/condition_variable.h>
-#include <cds/details/std/memory.h>     // unique_ptr
 #include <cds/details/aligned_type.h>
 
 namespace cds { namespace urcu {

diff --git a/tests/unit/pqueue/pop.cpp b/tests/unit/pqueue/pop.cpp
index c7e639269ef2f01dfb046bd5a08088ff938274ad..97fef068c0cb30ec6f18679071e608a50dd008e6 100644 (file)
--- a/tests/unit/pqueue/pop.cpp
+++ b/tests/unit/pqueue/pop.cpp
@@ -6,7 +6,7 @@
 
 #include <vector>
 #include <algorithm>    // random_shuffle
-#include <cds/details/std/memory.h>
+#include <memory>
 
 namespace pqueue {
 

diff --git a/tests/unit/pqueue/push.cpp b/tests/unit/pqueue/push.cpp
index 0c4c12128e784f92a644b7777d2faabf8422fea9..4ce079269ca743c2d71a9ab6c1a4b15fff5b5cda 100644 (file)
--- a/tests/unit/pqueue/push.cpp
+++ b/tests/unit/pqueue/push.cpp
@@ -6,7 +6,7 @@
 
 #include <vector>
 #include <algorithm>    // random_shuffle
-#include <cds/details/std/memory.h>
+#include <memory>
 
 namespace pqueue {
 

diff --git a/tests/unit/pqueue/push_pop.cpp b/tests/unit/pqueue/push_pop.cpp
index 84b69aaa11398a56f1744de6ff927b9db7970a77..51c27ebaaa8251205f32310fa856d2300bf62eb6 100644 (file)
--- a/tests/unit/pqueue/push_pop.cpp
+++ b/tests/unit/pqueue/push_pop.cpp
@@ -6,7 +6,7 @@
 
 #include <vector>
 #include <algorithm>    // random_shuffle
-#include <cds/details/std/memory.h>
+#include <memory>
 
 namespace pqueue {