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

diff --git a/cds/container/ellen_bintree_map_impl.h b/cds/container/ellen_bintree_map_impl.h
index d42c8619f700a8eac62ecf87e6e4db15b1f70be6..c499754882bfe41cf0092a666cb1cf35d8517577 100644 (file)
--- a/cds/container/ellen_bintree_map_impl.h
+++ b/cds/container/ellen_bintree_map_impl.h
@@ -3,10 +3,10 @@
 #ifndef __CDS_CONTAINER_ELLEN_BINTREE_MAP_IMPL_H
 #define __CDS_CONTAINER_ELLEN_BINTREE_MAP_IMPL_H
 
+#include <type_traits>
 #include <cds/container/ellen_bintree_base.h>
 #include <cds/intrusive/ellen_bintree_impl.h>
 #include <cds/details/functor_wrapper.h>
-#include <cds/details/std/type_traits.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/ellen_bintree_set_impl.h b/cds/container/ellen_bintree_set_impl.h
index a043156ae2a259a420343a1f878ba9a35b5744a8..90421ae04f3f2852ddc55a8ab8f7f9516874d0f2 100644 (file)
--- a/cds/container/ellen_bintree_set_impl.h
+++ b/cds/container/ellen_bintree_set_impl.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_ELLEN_BINTREE_SET_IMPL_H
 #define __CDS_CONTAINER_ELLEN_BINTREE_SET_IMPL_H
 
+#include <type_traits>
 #include <cds/container/ellen_bintree_base.h>
 #include <cds/intrusive/ellen_bintree_impl.h>
-#include <cds/details/std/type_traits.h>
 #include <cds/container/details/guarded_ptr_cast.h>
 
 namespace cds { namespace container {

diff --git a/cds/container/striped_map.h b/cds/container/striped_map.h
index d02e481a47b5a3318527d2e54d15ed9796a9aaef..30e987c3d8f1aaa3269572ae2f4e4567612884f3 100644 (file)
--- a/cds/container/striped_map.h
+++ b/cds/container/striped_map.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_CONTAINER_STRIPED_MAP_H
 #define __CDS_CONTAINER_STRIPED_MAP_H
 
+#include <type_traits>
 #include <cds/container/striped_set.h>
 #include <cds/container/striped_set/adapter.h>
-#include <cds/details/std/type_traits.h>
 #include <cds/details/binary_functor_wrapper.h>
 
 #ifndef CDS_CXX11_LAMBDA_SUPPORT

diff --git a/cds/details/allocator.h b/cds/details/allocator.h
index 7070c1fbd3c467ef7ebfcbaf0047bb54ffbaf517..7733c62db02fb8c664eb67e47d5d47e8197feada 100644 (file)
--- a/cds/details/allocator.h
+++ b/cds/details/allocator.h
@@ -10,10 +10,10 @@
         2008.03.08    Maxim.Khiszinsky    Created
 */
 
+#include <type_traits>
+#include <memory>
 #include <cds/details/defs.h>
 #include <cds/user_setup/allocator.h>
-#include <cds/details/std/type_traits.h>
-#include <memory>
 #include <boost/type_traits/has_trivial_destructor.hpp>
 
 namespace cds {

diff --git a/cds/details/std/type_traits.h b/cds/details/std/type_traits.h
deleted file mode 100644 (file)
index 2fca3ab..0000000
--- a/cds/details/std/type_traits.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//$$CDS-header$$
-
-//@cond
-#ifndef __CDS_DETAILS_STD_TYPE_TRAITS_H
-#define __CDS_DETAILS_STD_TYPE_TRAITS_H
-
-#include <cds/details/defs.h>
-#include <type_traits>
-
-// -----------------------------------------------------------------
-// std::integral_constant, std::true_type, std::false_type
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-
-namespace std {
-    using std::tr1::integral_constant;
-    using std::tr1::true_type;
-    using std::tr1::false_type;
-}   // namespace std
-#endif
-
-
-// -----------------------------------------------------------------
-// std::is_same, std::is_base_of
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-
-namespace std {
-    using std::tr1::is_same;
-    using std::tr1::is_base_of;
-}   // namespace std
-#endif
-
-
-// -----------------------------------------------------------------
-// std::conditional
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-
-#include <boost/type_traits/conditional.hpp>
-namespace std {
-    using boost::conditional;
-}   // namespace std
-#endif
-
-// -----------------------------------------------------------------
-// std::decay
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-
-#include <boost/type_traits/decay.hpp>
-namespace std {
-    using boost::decay;
-}   // namespace std
-#endif
-
-// -----------------------------------------------------------------
-// std::enable_if
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-
-namespace std {
-
-    template<bool Test, class Type = void>
-    struct enable_if
-    {};
-
-    template<class Type>
-    struct enable_if<true, Type>
-    {
-        typedef Type type;
-    };
-
-}   // namespace std
-#endif
-
-// -----------------------------------------------------------------
-// std::remove_const, std::remove_cv, std::remove_volatile
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER == 1500
-namespace std {
-    using std::tr1::remove_const;
-    using std::tr1::remove_volatile;
-    using std::tr1::remove_cv;
-    using std::tr1::remove_reference;
-}
-#endif
-
-#endif  // #ifndef __CDS_DETAILS_STD_TYPE_TRAITS_H
-//@endcond

diff --git a/cds/details/void_selector.h b/cds/details/void_selector.h
index 198cfb1125f806ccee6dc43be7fb120d04514de5..bbac72c9e175b44f16b04790904020cfe9711177 100644 (file)
--- a/cds/details/void_selector.h
+++ b/cds/details/void_selector.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_DETAILS_VOID_SELECTOR_H
 #define __CDS_DETAILS_VOID_SELECTOR_H
 
-#include <cds/details/std/type_traits.h>
+#include <type_traits>
 
 namespace cds {
     namespace details {

diff --git a/cds/intrusive/basket_queue.h b/cds/intrusive/basket_queue.h
index 4ee0f5b869af83d1a024c204e3ed8bb782f538ab..3d57b46ed436274182d403918f55694038f5c9ce 100644 (file)
--- a/cds/intrusive/basket_queue.h
+++ b/cds/intrusive/basket_queue.h
@@ -3,6 +3,7 @@
 #ifndef __CDS_INTRUSIVE_BASKET_QUEUE_H
 #define __CDS_INTRUSIVE_BASKET_QUEUE_H
 
+#include <type_traits>
 #include <cds/intrusive/base.h>
 #include <cds/details/marked_ptr.h>
 #include <cds/intrusive/queue_stat.h>
@@ -10,8 +11,6 @@
 #include <cds/ref.h>
 #include <cds/intrusive/details/dummy_node_holder.h>
 
-#include <cds/details/std/type_traits.h>
-
 namespace cds { namespace intrusive {
 
     /// BasketQueue -related definitions

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

diff --git a/cds/intrusive/details/ellen_bintree_base.h b/cds/intrusive/details/ellen_bintree_base.h
index 8c6e615db819776c16ce045c599fcf42f971b04b..25b81e8f3e426dee5d469af7350fc129a51081b5 100644 (file)
--- a/cds/intrusive/details/ellen_bintree_base.h
+++ b/cds/intrusive/details/ellen_bintree_base.h
@@ -3,10 +3,10 @@
 #ifndef __CDS_INTRUSIVE_DETAILS_ELLEN_BINTREE_BASE_H
 #define __CDS_INTRUSIVE_DETAILS_ELLEN_BINTREE_BASE_H
 
+#include <type_traits>
 #include <cds/intrusive/base.h>
 #include <cds/opt/options.h>
 #include <cds/urcu/options.h>
-#include <cds/details/std/type_traits.h>
 #include <cds/details/marked_ptr.h>
 #include <cds/details/allocator.h>
 

diff --git a/cds/intrusive/michael_deque.h b/cds/intrusive/michael_deque.h
index a4e8df6182e5be747f5eb2439cc9fedcf44e6265..539d3f44af718c48fe0d151a95f7007b8e713751 100644 (file)
--- a/cds/intrusive/michael_deque.h
+++ b/cds/intrusive/michael_deque.h
@@ -3,6 +3,7 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_DEQUE_H
 #define __CDS_INTRUSIVE_MICHAEL_DEQUE_H
 
+#include <type_traits>
 #include <cds/intrusive/michael_list_impl.h>
 #include <cds/intrusive/michael_set.h>
 #include <cds/intrusive/deque_stat.h>
@@ -10,8 +11,6 @@
 #include <cds/details/aligned_type.h>
 #include <cds/gc/default_gc.h>
 
-#include <cds/details/std/type_traits.h>
-
 namespace cds { namespace intrusive {
 
     //@cond

diff --git a/cds/intrusive/michael_list_base.h b/cds/intrusive/michael_list_base.h
index eccb1d498496648cfe85b71302aa0557e0058cc6..29927ea7399fd58ff877562bd31f6a64e477c66c 100644 (file)
--- a/cds/intrusive/michael_list_base.h
+++ b/cds/intrusive/michael_list_base.h
@@ -3,13 +3,13 @@
 #ifndef __CDS_INTRUSIVE_MICHAEL_LIST_BASE_H
 #define __CDS_INTRUSIVE_MICHAEL_LIST_BASE_H
 
+#include <type_traits>
 #include <cds/intrusive/base.h>
 #include <cds/opt/compare.h>
 #include <cds/cxx11_atomic.h>
 #include <cds/details/marked_ptr.h>
 #include <cds/ref.h>
 #include <cds/details/make_const_type.h>
-#include <cds/details/std/type_traits.h>
 #include <cds/urcu/options.h>
 
 namespace cds { namespace intrusive {

diff --git a/cds/intrusive/msqueue.h b/cds/intrusive/msqueue.h
index c27514f38585b580160481dee214d8f90c641ea7..fc52400a32c5b8eb957396fa06425f0707638c3d 100644 (file)
--- a/cds/intrusive/msqueue.h
+++ b/cds/intrusive/msqueue.h
@@ -3,12 +3,11 @@
 #ifndef __CDS_INTRUSIVE_MSQUEUE_H
 #define __CDS_INTRUSIVE_MSQUEUE_H
 
+#include <type_traits>
 #include <cds/intrusive/single_link_struct.h>
 #include <cds/intrusive/queue_stat.h>
 #include <cds/intrusive/details/dummy_node_holder.h>
 
-#include <cds/details/std/type_traits.h>
-
 namespace cds { namespace intrusive {
 
     /// Michael & Scott's lock-free queue (intrusive variant)

diff --git a/cds/intrusive/optimistic_queue.h b/cds/intrusive/optimistic_queue.h
index 0bb895f3dbf7a016710de4c93e42480b5dfda8e8..1b072b1b6840d3a445cce4e6ea2ba3692daff4f8 100644 (file)
--- a/cds/intrusive/optimistic_queue.h
+++ b/cds/intrusive/optimistic_queue.h
@@ -3,6 +3,7 @@
 #ifndef __CDS_INTRUSIVE_OPTIMISTIC_QUEUE_H
 #define __CDS_INTRUSIVE_OPTIMISTIC_QUEUE_H
 
+#include <type_traits>
 #include <cds/intrusive/base.h>
 #include <cds/cxx11_atomic.h>
 #include <cds/gc/default_gc.h>
@@ -10,8 +11,6 @@
 #include <cds/intrusive/queue_stat.h>
 #include <cds/ref.h>
 
-#include <cds/details/std/type_traits.h>
-
 namespace cds { namespace intrusive {
 
     /// Optimistic queue related definitions

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

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

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

diff --git a/cds/intrusive/treiber_stack.h b/cds/intrusive/treiber_stack.h
index c755f25e4dc2ba1a021d03bcdf623ac4e4b54127..34ea027aeb4a7aca32b8dc7cedbff63e6e8c9df2 100644 (file)
--- a/cds/intrusive/treiber_stack.h
+++ b/cds/intrusive/treiber_stack.h
@@ -3,13 +3,13 @@
 #ifndef __CDS_INTRUSIVE_TREIBER_STACK_H
 #define __CDS_INTRUSIVE_TREIBER_STACK_H
 
+#include <type_traits>
 #include <cds/intrusive/single_link_struct.h>
 #include <cds/ref.h>
 #include <cds/algo/elimination.h>
 #include <cds/opt/buffer.h>
 #include <cds/lock/spinlock.h>
 #include <cds/lock/scoped_lock.h>
-#include <cds/details/std/type_traits.h>
 #include <cds/details/type_padding.h>
 
 namespace cds { namespace intrusive {

diff --git a/cds/opt/compare.h b/cds/opt/compare.h
index f18940f3d90f2da644e129c665c9bc51eb61bfd4..6373a7ec109ec6449cfb4826d763b07944142f64 100644 (file)
--- a/cds/opt/compare.h
+++ b/cds/opt/compare.h
@@ -8,11 +8,10 @@
         2011.05.05 khizmax  Created
 */
 
-#include <cds/opt/options.h>
-
+#include <type_traits>
 #include <functional>
 #include <string>
-#include <cds/details/std/type_traits.h>
+#include <cds/opt/options.h>
 
 namespace cds { namespace opt {
 

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 5a9ce1580edb6604ff03d4f96c73de5540ad31c6..076a9eeb5cc64d49cbb7c41ad132557ed893a1fd 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -735,7 +735,6 @@
     <ClInclude Include="..\..\..\cds\details\std\thread.h" />\r
     <ClInclude Include="..\..\..\cds\details\std\chrono.h" />\r
     <ClInclude Include="..\..\..\cds\details\std\tuple.h" />\r
-    <ClInclude Include="..\..\..\cds\details\std\type_traits.h" />\r
     <ClInclude Include="..\..\..\cds\gc\all.h" />\r
     <ClInclude Include="..\..\..\cds\gc\exception.h" />\r
     <ClInclude Include="..\..\..\cds\gc\gc_fwd.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 602db1cce1b85fc653330577549728755e2168d9..5e7d1e8a58efc35eaf4c9efd444b9eeaea258cf7 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -878,9 +878,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\deque_stat.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\details\std\type_traits.h">\r
-      <Filter>Header Files\cds\details\std</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\details\std\memory.h">\r
       <Filter>Header Files\cds\details\std</Filter>\r
     </ClInclude>\r

diff --git a/tests/test-hdr/misc/find_option.cpp b/tests/test-hdr/misc/find_option.cpp
index 263476d3ba5cf93c8d8d6c06895115d67e3e2ca0..039fcb374fdb16216b90286bc8aeb08d83716821 100644 (file)
--- a/tests/test-hdr/misc/find_option.cpp
+++ b/tests/test-hdr/misc/find_option.cpp
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
+#include <type_traits>
 #include <cds/opt/options.h>
-#include <cds/details/std/type_traits.h>
 
 // Value options
 namespace {

diff --git a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp
index 69182782d44672d11304616416a37f29319ff398..0d2474a44242bfd90d5d659b02924f17de6f1d40 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp
@@ -4,7 +4,7 @@
 #include <cds/intrusive/striped_set/boost_list.h>
 #include <cds/intrusive/striped_set.h>
 
-#include <cds/details/std/type_traits.h>    // std::is_same
+#include <type_traits> // std::is_same
 
 namespace set {
     namespace bi = boost::intrusive;

diff --git a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_slist.cpp b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_slist.cpp
index 1e019d3ddbf3c596db64903830007b8db66fa07e..ba692dc90fdc70aaeffbe561b9a44c96f2ba9aa3 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_refinable_hashset_slist.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_refinable_hashset_slist.cpp
@@ -4,7 +4,7 @@
 #include <cds/intrusive/striped_set/boost_slist.h>
 #include <cds/intrusive/striped_set.h>
 
-#include <cds/details/std/type_traits.h>    // std::is_same
+#include <type_traits>    // std::is_same
 
 namespace set {
     namespace bi = boost::intrusive;

diff --git a/tests/test-hdr/set/hdr_intrusive_striped_hashset_list.cpp b/tests/test-hdr/set/hdr_intrusive_striped_hashset_list.cpp
index c4866bdf498f7867b54ff2d632c72eb38179d89f..1159c0123b27e79736b2344cee98e278d091b1e8 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_striped_hashset_list.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_striped_hashset_list.cpp
@@ -4,7 +4,7 @@
 #include <cds/intrusive/striped_set/boost_list.h>
 #include <cds/intrusive/striped_set.h>
 
-#include <cds/details/std/type_traits.h>    // std::is_same
+#include <type_traits> // std::is_same
 
 namespace set {
     namespace bi = boost::intrusive;

diff --git a/tests/test-hdr/set/hdr_intrusive_striped_hashset_slist.cpp b/tests/test-hdr/set/hdr_intrusive_striped_hashset_slist.cpp
index cb431efaf192e66a1ab6c1c6a987578acfe9541c..1ac5b4f805d8d88a46427857245eb6117a979b15 100644 (file)
--- a/tests/test-hdr/set/hdr_intrusive_striped_hashset_slist.cpp
+++ b/tests/test-hdr/set/hdr_intrusive_striped_hashset_slist.cpp
@@ -4,7 +4,7 @@
 #include <cds/intrusive/striped_set/boost_slist.h>
 #include <cds/intrusive/striped_set.h>
 
-#include <cds/details/std/type_traits.h>    // std::is_same
+#include <type_traits> // std::is_same
 
 namespace set {
     namespace bi = boost::intrusive;