From: khizmax <khizmax@gmail.com>
Date: Fri, 19 Sep 2014 07:49:58 +0000 (+0400)
Subject: Remove cds/details/std/tuple.h, use STL <tuple> instead
X-Git-Tag: v2.0.0~336
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d5ac3ffc7748bbcdd83464aae294509f0b48a6f5;p=libcds.git

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
index 97b935f7..00000000
--- 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 643f52d3..6d5a88d7 100644
--- 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 076a9eeb..9a283b87 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -734,7 +734,6 @@
     <ClInclude Include="..\..\..\cds\details\std\mutex.h" />
     <ClInclude Include="..\..\..\cds\details\std\thread.h" />
     <ClInclude Include="..\..\..\cds\details\std\chrono.h" />
-    <ClInclude Include="..\..\..\cds\details\std\tuple.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 5e7d1e8a..4346d06a 100644
--- 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">
       <Filter>Header Files\cds\details\std</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\details\std\tuple.h">
-      <Filter>Header Files\cds\details\std</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>