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

diff --git a/cds/details/std/tuple.h b/cds/details/std/tuple.h
deleted file mode 100644 (file)
index 97b935f..0000000
--- a/cds/details/std/tuple.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//$$CDS-header$$
-
-//@cond
-#ifndef __CDS_DETAILS_STD_TUPLE_H
-#define __CDS_DETAILS_STD_TUPLE_H
-
-#include <cds/details/defs.h>
-
-#if (CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL) && _MSC_VER < 1600
-// MS VC 2008
-#include <boost/tuple/tuple.hpp>
-
-namespace std {
-    using boost::tuple;
-    using boost::get;
-    using boost::make_tuple;
-    using boost::tie;
-
-    template <class Tuple>
-    struct tuple_size {
-        static size_t const value = boost::tuples::length<Tuple>::value;
-    };
-
-}   // namespace std
-#else
-#   include <tuple>
-#endif
-
-#endif // #ifndef __CDS_DETAILS_STD_MEMORY_H
-//@endcond

diff --git a/cds/opt/hash.h b/cds/opt/hash.h
index 643f52d3838ac6c99db0c8c5ac94b20b085ae90b..6d5a88d78c2a8716d5b5fbadb7cbdffe24135569 100644 (file)
--- a/cds/opt/hash.h
+++ b/cds/opt/hash.h
@@ -3,9 +3,9 @@
 #ifndef __CDS_OPT_HASH_H
 #define __CDS_OPT_HASH_H
 
+#include <tuple>
 #include <cds/opt/options.h>
 #include <cds/details/hash_functor_selector.h>
-#include <cds/details/std/tuple.h>
 
 namespace cds { namespace opt {
 

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 076a9eeb5cc64d49cbb7c41ad132557ed893a1fd..9a283b87a2def4f90fa43ce515f00ee63b92bb4f 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -734,7 +734,6 @@
     <ClInclude Include="..\..\..\cds\details\std\mutex.h" />\r
     <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\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 5e7d1e8a58efc35eaf4c9efd444b9eeaea258cf7..4346d06a3d7ad567aa70fb41aa57411cced308a5 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -881,9 +881,6 @@
     <ClInclude Include="..\..\..\cds\details\std\memory.h">\r
       <Filter>Header Files\cds\details\std</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\details\std\tuple.h">\r
-      <Filter>Header Files\cds\details\std</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r