From c9a406f8701070dc88ae03ed36a13c51f1aeb3af Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 18 Sep 2014 19:33:46 +0400
Subject: [PATCH] Move cds/bitop.h to cds/algo/bitop.h

---
 cds/{ => algo}/bitop.h                | 0
 cds/details/bit_reverse_counter.h     | 2 +-
 cds/int_algo.h                        | 2 +-
 cds/intrusive/michael_set_base.h      | 2 +-
 cds/intrusive/skip_list_base.h        | 2 +-
 cds/intrusive/split_list_base.h       | 2 +-
 projects/Win/vc12/cds.vcxproj         | 1 -
 projects/Win/vc12/cds.vcxproj.filters | 3 ---
 src/dllmain.cpp                       | 2 +-
 9 files changed, 6 insertions(+), 10 deletions(-)
 rename cds/{ => algo}/bitop.h (100%)

diff --git a/cds/bitop.h b/cds/algo/bitop.h
similarity index 100%
rename from cds/bitop.h
rename to cds/algo/bitop.h
diff --git a/cds/details/bit_reverse_counter.h b/cds/details/bit_reverse_counter.h
index 5f0df6ee..d12f8532 100644
--- a/cds/details/bit_reverse_counter.h
+++ b/cds/details/bit_reverse_counter.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_DETAILS_BIT_REVERSE_COUNTER_H
 #define __CDS_DETAILS_BIT_REVERSE_COUNTER_H
 
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
 
 //@cond
 namespace cds { namespace bitop {
diff --git a/cds/int_algo.h b/cds/int_algo.h
index 5e20a7b0..b4db2b82 100644
--- a/cds/int_algo.h
+++ b/cds/int_algo.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_INT_ALGO_H
 #define __CDS_INT_ALGO_H
 
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
 
 namespace cds { namespace beans {
 
diff --git a/cds/intrusive/michael_set_base.h b/cds/intrusive/michael_set_base.h
index abd6169c..acc35c85 100644
--- a/cds/intrusive/michael_set_base.h
+++ b/cds/intrusive/michael_set_base.h
@@ -6,7 +6,7 @@
 #include <cds/intrusive/base.h>
 #include <cds/opt/compare.h>
 #include <cds/opt/hash.h>
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
 #include <cds/cxx11_atomic.h>
 #include <cds/ref.h>
 
diff --git a/cds/intrusive/skip_list_base.h b/cds/intrusive/skip_list_base.h
index 9715c43a..36af85e6 100644
--- a/cds/intrusive/skip_list_base.h
+++ b/cds/intrusive/skip_list_base.h
@@ -5,7 +5,7 @@
 
 #include <cds/intrusive/base.h>
 #include <cds/details/marked_ptr.h>
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
 #include <cds/os/timer.h>
 #include <cds/urcu/options.h>
 
diff --git a/cds/intrusive/split_list_base.h b/cds/intrusive/split_list_base.h
index 2b1b73a9..a5365535 100644
--- a/cds/intrusive/split_list_base.h
+++ b/cds/intrusive/split_list_base.h
@@ -7,7 +7,7 @@
 #include <cds/cxx11_atomic.h>
 #include <cds/details/allocator.h>
 #include <cds/int_algo.h>
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
 #include <cds/details/functor_wrapper.h>
 
 namespace cds { namespace intrusive {
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 2c7c3604..90d9b8c9 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -809,7 +809,6 @@
     <ClInclude Include="..\..\..\cds\urcu\signal_buffered.h" />
     <ClInclude Include="..\..\..\cds\urcu\signal_threaded.h" />
     <ClInclude Include="..\..\..\src\hzp_const.h" />
-    <ClInclude Include="..\..\..\cds\bitop.h" />
     <ClInclude Include="..\..\..\cds\init.h" />
     <ClInclude Include="..\..\..\cds\int_algo.h" />
     <ClInclude Include="..\..\..\cds\numtraits.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 7ac92ccf..9a573f08 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -194,9 +194,6 @@
     <ClInclude Include="..\..\..\src\hzp_const.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\bitop.h">
-      <Filter>Header Files\cds</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\init.h">
       <Filter>Header Files\cds</Filter>
     </ClInclude>
diff --git a/src/dllmain.cpp b/src/dllmain.cpp
index 06921f14..1fc9b85c 100644
--- a/src/dllmain.cpp
+++ b/src/dllmain.cpp
@@ -20,7 +20,7 @@ static HINSTANCE            s_DllInstance = NULL;
 // For Windows below Windows 7
 
 #include <cds/os/topology.h>
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
 
 static unsigned int     s_nProcessorCount = 1;
 static unsigned int     s_nProcessorGroupCount = 1;
-- 
2.34.1