From ecc7c0d16fa5c0a4e40b0c8a959e9172e5b07b51 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Fri, 19 Sep 2014 11:47:09 +0400
Subject: [PATCH] Remove cds/details/std/type_traits.h, use STL <type_traits>
 instead

---
 cds/container/ellen_bintree_map_impl.h        |  2 +-
 cds/container/ellen_bintree_set_impl.h        |  2 +-
 cds/container/striped_map.h                   |  2 +-
 cds/details/allocator.h                       |  4 +-
 cds/details/std/type_traits.h                 | 89 -------------------
 cds/details/void_selector.h                   |  2 +-
 cds/intrusive/basket_queue.h                  |  3 +-
 cds/intrusive/cuckoo_set.h                    |  2 +-
 cds/intrusive/details/ellen_bintree_base.h    |  2 +-
 cds/intrusive/michael_deque.h                 |  3 +-
 cds/intrusive/michael_list_base.h             |  2 +-
 cds/intrusive/msqueue.h                       |  3 +-
 cds/intrusive/optimistic_queue.h              |  3 +-
 cds/intrusive/skip_list_impl.h                |  2 +-
 cds/intrusive/skip_list_nogc.h                |  2 +-
 cds/intrusive/skip_list_rcu.h                 |  2 +-
 cds/intrusive/treiber_stack.h                 |  2 +-
 cds/opt/compare.h                             |  5 +-
 projects/Win/vc12/cds.vcxproj                 |  1 -
 projects/Win/vc12/cds.vcxproj.filters         |  3 -
 tests/test-hdr/misc/find_option.cpp           |  2 +-
 .../hdr_intrusive_refinable_hashset_list.cpp  |  2 +-
 .../hdr_intrusive_refinable_hashset_slist.cpp |  2 +-
 .../hdr_intrusive_striped_hashset_list.cpp    |  2 +-
 .../hdr_intrusive_striped_hashset_slist.cpp   |  2 +-
 25 files changed, 24 insertions(+), 122 deletions(-)
 delete mode 100644 cds/details/std/type_traits.h

diff --git a/cds/container/ellen_bintree_map_impl.h b/cds/container/ellen_bintree_map_impl.h
index d42c8619..c4997548 100644
--- 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 a043156a..90421ae0 100644
--- 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 d02e481a..30e987c3 100644
--- 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 7070c1fb..7733c62d 100644
--- 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
index 2fca3ab5..00000000
--- 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 198cfb11..bbac72c9 100644
--- 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 4ee0f5b8..3d57b46e 100644
--- 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 59333fe6..b6196c3b 100644
--- 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 8c6e615d..25b81e8f 100644
--- 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 a4e8df61..539d3f44 100644
--- 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 eccb1d49..29927ea7 100644
--- 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 c27514f3..fc52400a 100644
--- 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 0bb895f3..1b072b1b 100644
--- 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 386e3073..9822023a 100644
--- 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 98daa06e..da524bdc 100644
--- 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 61aaec66..07975ec9 100644
--- 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 c755f25e..34ea027a 100644
--- 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 f18940f3..6373a7ec 100644
--- 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 5a9ce158..076a9eeb 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -735,7 +735,6 @@
     <ClInclude Include="..\..\..\cds\details\std\thread.h" />
     <ClInclude Include="..\..\..\cds\details\std\chrono.h" />
     <ClInclude Include="..\..\..\cds\details\std\tuple.h" />
-    <ClInclude Include="..\..\..\cds\details\std\type_traits.h" />
     <ClInclude Include="..\..\..\cds\gc\all.h" />
     <ClInclude Include="..\..\..\cds\gc\exception.h" />
     <ClInclude Include="..\..\..\cds\gc\gc_fwd.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 602db1cc..5e7d1e8a 100644
--- 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">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\details\std\type_traits.h">
-      <Filter>Header Files\cds\details\std</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\details\std\memory.h">
       <Filter>Header Files\cds\details\std</Filter>
     </ClInclude>
diff --git a/tests/test-hdr/misc/find_option.cpp b/tests/test-hdr/misc/find_option.cpp
index 263476d3..039fcb37 100644
--- 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 69182782..0d2474a4 100644
--- 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 1e019d3d..ba692dc9 100644
--- 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 c4866bdf..1159c012 100644
--- 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 cb431efa..1ac5b4f8 100644
--- 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;
-- 
2.34.1