Remove cstdint_boost.h, csdtint_std.h wrappers

diff --git a/cds/compiler/clang/defs.h b/cds/compiler/clang/defs.h
index 0c2fe8546d593f4bcb80bb0212ad47240e921d22..af1239bafe76eadb6241a3f33ec8cf24f729c635 100644 (file)
--- 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 (file)
index cbaae29..0000000
--- 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 (file)
index c3919c6..0000000
--- 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 803945ec97794a409e2abaa1895aacddedfe22e9..0df786ddf253cf36633525e8037c2f9990f3ed29 100644 (file)
--- 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 96391fd4a5850ab98361e5c5845b267b3230721c..5f2809b38904f484f1b1c98e4ef8f3b747648354 100644 (file)
--- 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 c118faa49bb9c331c584fcb266a528135a0c5b33..f927231758b6596a2ec71d220e095e9b0cb833b1 100644 (file)
--- 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 36a178fb1ec6b1b37419ba771365e99f563a3365..92d9c6aba562b1393192db6e526de23ac77ad866 100644 (file)
--- 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 13436ef96aa4e8b93231bf351db4b5ca44b11da6..ed9e83be3445e32c965ce031206c3cad56ad7003 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -639,8 +639,6 @@
     <ClInclude Include="..\..\..\cds\algo\flat_combining.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\clang\cxx11_atomic_prepatches.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\clang\defs.h" />\r
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_boost.h" />\r
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_std.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_patches.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_prepatches.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 7c59474425b24b9865b88ca023415910fd91cc29..5df3e4978ebefb709b9a41a1cb20c8dc5a0b11d4 100644 (file)
--- 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">\r
       <Filter>Header Files\cds\compiler\gcc\ia64</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_boost.h">\r
-      <Filter>Header Files\cds\compiler</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\cstdint_std.h">\r
-      <Filter>Header Files\cds\compiler</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_patches.h">\r
       <Filter>Header Files\cds\compiler</Filter>\r
     </ClInclude>\r
@@ -1325,5 +1319,8 @@
     <ClInclude Include="..\..\..\cds\algo\elimination_tls.h">\r
       <Filter>Header Files\cds\algo</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\cds\algo\flat_combining.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file