From 0d6472a3a17a386de362769dbd0855b17f30855d Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 18 Sep 2014 19:43:59 +0400
Subject: [PATCH] Move cds/numtraits.h to cds/details/numtraits.h

---
 cds/details/defs.h                    | 2 +-
 cds/{ => details}/numtraits.h         | 6 +++---
 projects/Win/vc12/cds.vcxproj         | 3 ++-
 projects/Win/vc12/cds.vcxproj.filters | 9 ++++++---
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename cds/{ => details}/numtraits.h (98%)

diff --git a/cds/details/defs.h b/cds/details/defs.h
index 92d9c6ab..d6dc4d0c 100644
--- a/cds/details/defs.h
+++ b/cds/details/defs.h
@@ -408,7 +408,7 @@ namespace cds {
  Common things
 **************************************************************************/
 
-#include <cds/numtraits.h>
+#include <cds/details/numtraits.h>
 
 namespace cds {
 
diff --git a/cds/numtraits.h b/cds/details/numtraits.h
similarity index 98%
rename from cds/numtraits.h
rename to cds/details/numtraits.h
index df262a0a..a84a55f7 100644
--- a/cds/numtraits.h
+++ b/cds/details/numtraits.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_NUMERIC_TRAITS_H
-#define __CDS_NUMERIC_TRAITS_H
+#ifndef __CDS_DETAILS_NUMERIC_TRAITS_H
+#define __CDS_DETAILS_NUMERIC_TRAITS_H
 
 /*
     Filename: numtraits.h
@@ -219,4 +219,4 @@ namespace cds {
     }    // namespace beans
 }    // namespace cds
 
-#endif    // __CDS_NUMERIC_TRAITS_H
+#endif    // __CDS_DETAILS_NUMERIC_TRAITS_H
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 2ef5e971..5a9ce158 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -634,6 +634,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\cds\algo\backoff_strategy.h" />
     <ClInclude Include="..\..\..\cds\algo\base.h" />
+    <ClInclude Include="..\..\..\cds\algo\bitop.h" />
     <ClInclude Include="..\..\..\cds\algo\elimination.h" />
     <ClInclude Include="..\..\..\cds\algo\elimination_opt.h" />
     <ClInclude Include="..\..\..\cds\algo\elimination_tls.h" />
@@ -726,6 +727,7 @@
     <ClInclude Include="..\..\..\cds\details\cxx11_features.h" />
     <ClInclude Include="..\..\..\cds\details\hash_functor_selector.h" />
     <ClInclude Include="..\..\..\cds\details\lib.h" />
+    <ClInclude Include="..\..\..\cds\details\numtraits.h" />
     <ClInclude Include="..\..\..\cds\details\static_functor.h" />
     <ClInclude Include="..\..\..\cds\details\std\condition_variable.h" />
     <ClInclude Include="..\..\..\cds\details\std\memory.h" />
@@ -810,7 +812,6 @@
     <ClInclude Include="..\..\..\cds\urcu\signal_threaded.h" />
     <ClInclude Include="..\..\..\src\hzp_const.h" />
     <ClInclude Include="..\..\..\cds\init.h" />
-    <ClInclude Include="..\..\..\cds\numtraits.h" />
     <ClInclude Include="..\..\..\cds\ref.h" />
     <ClInclude Include="..\..\..\cds\refcounter.h" />
     <ClInclude Include="..\..\..\cds\version.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 3f678be6..602db1cc 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -197,9 +197,6 @@
     <ClInclude Include="..\..\..\cds\init.h">
       <Filter>Header Files\cds</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\numtraits.h">
-      <Filter>Header Files\cds</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\ref.h">
       <Filter>Header Files\cds</Filter>
     </ClInclude>
@@ -1316,5 +1313,11 @@
     <ClInclude Include="..\..\..\cds\algo\backoff_strategy.h">
       <Filter>Header Files\cds\algo</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\algo\bitop.h">
+      <Filter>Header Files\cds\algo</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\cds\details\numtraits.h">
+      <Filter>Header Files\cds\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
2.34.1