From 4cea7f63c979b3225eead374ad178961f73eb398 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 18 Sep 2014 19:22:24 +0400
Subject: [PATCH] Remove cstdint_boost.h, csdtint_std.h wrappers

---
 cds/compiler/clang/defs.h             |  3 --
 cds/compiler/cstdint_boost.h          | 44 ---------------------------
 cds/compiler/cstdint_std.h            | 43 --------------------------
 cds/compiler/gcc/defs.h               |  2 --
 cds/compiler/icl/defs.h               | 10 ------
 cds/compiler/vc/defs.h                |  3 --
 cds/details/defs.h                    |  1 +
 projects/Win/vc12/cds.vcxproj         |  2 --
 projects/Win/vc12/cds.vcxproj.filters |  9 ++----
 9 files changed, 4 insertions(+), 113 deletions(-)
 delete mode 100644 cds/compiler/cstdint_boost.h
 delete mode 100644 cds/compiler/cstdint_std.h

diff --git a/cds/compiler/clang/defs.h b/cds/compiler/clang/defs.h
index 0c2fe854..af1239ba 100644
--- a/cds/compiler/clang/defs.h
+++ b/cds/compiler/clang/defs.h
@@ -90,9 +90,6 @@
 #   define CDS_CXX11_THREAD_LOCAL_SUPPORT
 #endif
 
-
-#include <cds/compiler/cstdint_std.h>
-
 // Thread support library (thread, mutex, condition variable, chrono)
 #if CDS_COMPILER_VERSION >= 30100
 #   if __has_include(<thread>)
diff --git a/cds/compiler/cstdint_boost.h b/cds/compiler/cstdint_boost.h
deleted file mode 100644
index cbaae293..00000000
--- a/cds/compiler/cstdint_boost.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_COMPILER_CSTDINT_BOOST_H
-#define __CDS_COMPILER_CSTDINT_BOOST_H
-//@cond
-
-#include <boost/cstdint.hpp>
-
-namespace cds {
-    using boost::int_least8_t;
-    using boost::uint_least8_t;
-    using boost::int_least16_t;
-    using boost::uint_least16_t;
-    using boost::int_least32_t;
-    using boost::uint_least32_t;
-    using boost::int_least64_t;
-    using boost::uint_least64_t;
-    using boost::int_fast8_t;
-    using boost::uint_fast8_t;
-    using boost::int_fast16_t;
-    using boost::uint_fast16_t;
-    using boost::int_fast32_t;
-    using boost::uint_fast32_t;
-    using boost::int_fast64_t;
-    using boost::uint_fast64_t;
-
-    using boost::intmax_t;
-    using boost::uintmax_t;
-
-    using boost::int8_t;
-    using boost::uint8_t;
-    using boost::int16_t;
-    using boost::uint16_t;
-    using boost::int32_t;
-    using boost::uint32_t;
-    using boost::int64_t;
-    using boost::uint64_t;
-
-    using ::intptr_t;
-    using ::uintptr_t;
-} // namespace cds
-
-//@endcond
-#endif // #ifndef __CDS_COMPILER_CSTDINT_BOOST_H
diff --git a/cds/compiler/cstdint_std.h b/cds/compiler/cstdint_std.h
deleted file mode 100644
index c3919c6e..00000000
--- a/cds/compiler/cstdint_std.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_COMPILER_CSTDINT_STD_H
-#define __CDS_COMPILER_CSTDINT_STD_H
-//@cond
-
-#include <cstdint>
-namespace cds {
-    using std::int_least8_t;
-    using std::uint_least8_t;
-    using std::int_least16_t;
-    using std::uint_least16_t;
-    using std::int_least32_t;
-    using std::uint_least32_t;
-    using std::int_least64_t;
-    using std::uint_least64_t;
-    using std::int_fast8_t;
-    using std::uint_fast8_t;
-    using std::int_fast16_t;
-    using std::uint_fast16_t;
-    using std::int_fast32_t;
-    using std::uint_fast32_t;
-    using std::int_fast64_t;
-    using std::uint_fast64_t;
-
-    using std::intmax_t;
-    using std::uintmax_t;
-
-    using std::int8_t;
-    using std::uint8_t;
-    using std::int16_t;
-    using std::uint16_t;
-    using std::int32_t;
-    using std::uint32_t;
-    using std::int64_t;
-    using std::uint64_t;
-    using std::intptr_t;
-    using std::uintptr_t;
-} // namespace cds
-
-
-//@endcond
-#endif // #ifndef __CDS_COMPILER_CSTDINT_STD_H
diff --git a/cds/compiler/gcc/defs.h b/cds/compiler/gcc/defs.h
index 803945ec..0df786dd 100644
--- a/cds/compiler/gcc/defs.h
+++ b/cds/compiler/gcc/defs.h
@@ -115,8 +115,6 @@
 #   define CDS_DISABLE_DEFAULT_MOVE_CTOR
 #endif
 
-#include <cds/compiler/cstdint_std.h>
-
 // Thread support library (thread, mutex, condition variable, chrono)
 #if CDS_COMPILER_VERSION >= 40800
 #   define CDS_CXX11_STDLIB_THREAD
diff --git a/cds/compiler/icl/defs.h b/cds/compiler/icl/defs.h
index 96391fd4..5f2809b3 100644
--- a/cds/compiler/icl/defs.h
+++ b/cds/compiler/icl/defs.h
@@ -162,16 +162,6 @@
 //#   define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT
 //#endif
 
-
-// <cstdint>
-// <cstdint>
-#if _MSC_VER == 1500
-// MS VC 2008 has no <cstdint>
-#   include <cds/compiler/cstdint_boost.h>
-#else
-#   include <cds/compiler/cstdint_std.h>
-#endif
-
 // Thread support library (thread, mutex, condition variable)
 #if _MSC_VER >= 1700
     // MS VC 11+
diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h
index c118faa4..f9272317 100644
--- a/cds/compiler/vc/defs.h
+++ b/cds/compiler/vc/defs.h
@@ -124,9 +124,6 @@
 #   define CDS_DISABLE_DEFAULT_MOVE_CTOR
 #endif
 
-// <cstdint>
-#include <cstdint>
-
 // Thread support library (thread, mutex, condition variable)
 #define CDS_CXX11_STDLIB_THREAD
 #define CDS_CXX11_STDLIB_MUTEX
diff --git a/cds/details/defs.h b/cds/details/defs.h
index 36a178fb..92d9c6ab 100644
--- a/cds/details/defs.h
+++ b/cds/details/defs.h
@@ -4,6 +4,7 @@
 #define __CDS_DEFS_H
 
 #include <assert.h>
+#include <cstdint>
 #include <exception>
 #include <string>
 #include <memory>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 13436ef9..ed9e83be 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -639,8 +639,6 @@
     <ClInclude Include="..\..\..\cds\algo\flat_combining.h" />
     <ClInclude Include="..\..\..\cds\compiler\clang\cxx11_atomic_prepatches.h" />
     <ClInclude Include="..\..\..\cds\compiler\clang\defs.h" />
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_boost.h" />
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_std.h" />
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic.h" />
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_patches.h" />
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_prepatches.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 7c594744..5df3e497 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -845,12 +845,6 @@
     <ClInclude Include="..\..\..\cds\compiler\gcc\ia64\cxx11_atomic.h">
       <Filter>Header Files\cds\compiler\gcc\ia64</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_boost.h">
-      <Filter>Header Files\cds\compiler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_std.h">
-      <Filter>Header Files\cds\compiler</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_patches.h">
       <Filter>Header Files\cds\compiler</Filter>
     </ClInclude>
@@ -1325,5 +1319,8 @@
     <ClInclude Include="..\..\..\cds\algo\elimination_tls.h">
       <Filter>Header Files\cds\algo</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\algo\flat_combining.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1