From b18cd709db95407e9e6b0ead1955f11f1c6560d4 Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 18:24:33 +0400
Subject: [PATCH] Move cds/intrusive/single_link_struct.h to
 cds/intrusive/details directory

---
 cds/intrusive/basket_queue.h                         | 2 +-
 cds/intrusive/{ => details}/single_link_struct.h     | 6 +++---
 cds/intrusive/msqueue.h                              | 2 +-
 cds/intrusive/treiber_stack.h                        | 2 +-
 projects/Win/vc12/cds.vcxproj                        | 2 +-
 projects/Win/vc12/cds.vcxproj.filters                | 6 +++---
 tests/test-hdr/queue/hdr_intrusive_singlelink_node.h | 2 +-
 tests/test-hdr/stack/hdr_intrusive_treiber_stack.h   | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename cds/intrusive/{ => details}/single_link_struct.h (97%)

diff --git a/cds/intrusive/basket_queue.h b/cds/intrusive/basket_queue.h
index 572feb43..3a2d4aed 100644
--- a/cds/intrusive/basket_queue.h
+++ b/cds/intrusive/basket_queue.h
@@ -7,7 +7,7 @@
 #include <cds/intrusive/base.h>
 #include <cds/details/marked_ptr.h>
 #include <cds/intrusive/queue_stat.h>
-#include <cds/intrusive/single_link_struct.h>
+#include <cds/intrusive/details/single_link_struct.h>
 #include <cds/ref.h>
 #include <cds/intrusive/details/dummy_node_holder.h>
 
diff --git a/cds/intrusive/single_link_struct.h b/cds/intrusive/details/single_link_struct.h
similarity index 97%
rename from cds/intrusive/single_link_struct.h
rename to cds/intrusive/details/single_link_struct.h
index 960095f6..d3e3cc85 100644
--- a/cds/intrusive/single_link_struct.h
+++ b/cds/intrusive/details/single_link_struct.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_INTRUSIVE_SINGLE_LINK_STRUCT_H
-#define __CDS_INTRUSIVE_SINGLE_LINK_STRUCT_H
+#ifndef __CDS_INTRUSIVE_DETAILS_SINGLE_LINK_STRUCT_H
+#define __CDS_INTRUSIVE_DETAILS_SINGLE_LINK_STRUCT_H
 
 #include <cds/intrusive/base.h>
 #include <cds/gc/default_gc.h>
@@ -224,4 +224,4 @@ namespace cds { namespace intrusive {
 
 
 
-#endif // #ifndef __CDS_INTRUSIVE_SINGLE_LINK_STRUCT_H
+#endif // #ifndef __CDS_INTRUSIVE_DETAILS_SINGLE_LINK_STRUCT_H
diff --git a/cds/intrusive/msqueue.h b/cds/intrusive/msqueue.h
index bbf9857f..f81a1ad6 100644
--- a/cds/intrusive/msqueue.h
+++ b/cds/intrusive/msqueue.h
@@ -4,7 +4,7 @@
 #define __CDS_INTRUSIVE_MSQUEUE_H
 
 #include <type_traits>
-#include <cds/intrusive/single_link_struct.h>
+#include <cds/intrusive/details/single_link_struct.h>
 #include <cds/intrusive/queue_stat.h>
 #include <cds/intrusive/details/dummy_node_holder.h>
 
diff --git a/cds/intrusive/treiber_stack.h b/cds/intrusive/treiber_stack.h
index ba69873c..48d17919 100644
--- a/cds/intrusive/treiber_stack.h
+++ b/cds/intrusive/treiber_stack.h
@@ -4,7 +4,7 @@
 #define __CDS_INTRUSIVE_TREIBER_STACK_H
 
 #include <type_traits>
-#include <cds/intrusive/single_link_struct.h>
+#include <cds/intrusive/details/single_link_struct.h>
 #include <cds/ref.h>
 #include <cds/algo/elimination.h>
 #include <cds/opt/buffer.h>
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index e417beaa..b1f56060 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -738,6 +738,7 @@
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\dummy_node_holder.h" />
     <ClInclude Include="..\..\..\cds\intrusive\details\ellen_bintree_base.h" />
+    <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_hp.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_impl.h" />
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" />
@@ -938,7 +939,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\optimistic_queue.h" />
     <ClInclude Include="..\..\..\cds\intrusive\queue_stat.h" />
     <ClInclude Include="..\..\..\cds\intrusive\segmented_queue.h" />
-    <ClInclude Include="..\..\..\cds\intrusive\single_link_struct.h" />
     <ClInclude Include="..\..\..\cds\intrusive\split_list.h" />
     <ClInclude Include="..\..\..\cds\intrusive\split_list_base.h" />
     <ClInclude Include="..\..\..\cds\intrusive\split_list_nogc.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index ed80d9e2..27e6442c 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -611,9 +611,6 @@
     <ClInclude Include="..\..\..\cds\intrusive\segmented_queue.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\cds\intrusive\single_link_struct.h">
-      <Filter>Header Files\cds\intrusive</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\cds\intrusive\split_list.h">
       <Filter>Header Files\cds\intrusive</Filter>
     </ClInclude>
@@ -1277,5 +1274,8 @@
     <ClInclude Include="..\..\..\cds\compiler\gcc\x86\cxx11_atomic32.h">
       <Filter>Header Files\cds\compiler\gcc\x86</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h">
+      <Filter>Header Files\cds\intrusive\details</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/test-hdr/queue/hdr_intrusive_singlelink_node.h b/tests/test-hdr/queue/hdr_intrusive_singlelink_node.h
index e6ecc3ae..a3d2f94f 100644
--- a/tests/test-hdr/queue/hdr_intrusive_singlelink_node.h
+++ b/tests/test-hdr/queue/hdr_intrusive_singlelink_node.h
@@ -3,7 +3,7 @@
 #ifndef CDSTEST_HDR_TEST_INTRUSIVE_SINGLELINK_NODE_H
 #define CDSTEST_HDR_TEST_INTRUSIVE_SINGLELINK_NODE_H
 
-#include <cds/intrusive/single_link_struct.h>
+#include <cds/intrusive/details/single_link_struct.h>
 
 namespace queue {
     namespace ci = cds::intrusive;
diff --git a/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h b/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h
index 41077a08..5d3f312d 100644
--- a/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h
+++ b/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
 #include "cppunit/cppunit_proxy.h"
-#include <cds/intrusive/single_link_struct.h>
+#include <cds/intrusive/details/single_link_struct.h>
 
 namespace stack {
 
-- 
2.34.1