From e007c70e49427745a4838e64704eac8e6dffc52c Mon Sep 17 00:00:00 2001 From: khizmax <libcds.dev@gmail.com> Date: Sat, 27 Sep 2014 19:51:36 +0400 Subject: [PATCH] Move split_list_base.h from cds/intrusive to cds/intrusive/details --- cds/container/split_list_base.h | 2 +- cds/intrusive/{ => details}/split_list_base.h | 6 +++--- cds/intrusive/split_list.h | 2 +- cds/intrusive/split_list_nogc.h | 2 +- cds/intrusive/split_list_rcu.h | 2 +- projects/Win/vc12/cds.vcxproj | 2 +- projects/Win/vc12/cds.vcxproj.filters | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) rename cds/intrusive/{ => details}/split_list_base.h (99%) diff --git a/cds/container/split_list_base.h b/cds/container/split_list_base.h index dd256e0e..3c0584cb 100644 --- a/cds/container/split_list_base.h +++ b/cds/container/split_list_base.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_SPLIT_LIST_BASE_H #define __CDS_CONTAINER_SPLIT_LIST_BASE_H -#include <cds/intrusive/split_list_base.h> +#include <cds/intrusive/details/split_list_base.h> namespace cds { namespace container { diff --git a/cds/intrusive/split_list_base.h b/cds/intrusive/details/split_list_base.h similarity index 99% rename from cds/intrusive/split_list_base.h rename to cds/intrusive/details/split_list_base.h index 1c86abcc..d88efac2 100644 --- a/cds/intrusive/split_list_base.h +++ b/cds/intrusive/details/split_list_base.h @@ -1,7 +1,7 @@ //$$CDS-header$$ -#ifndef __CDS_INTRUSIVE_SPLIT_LIST_BASE_H -#define __CDS_INTRUSIVE_SPLIT_LIST_BASE_H +#ifndef __CDS_INTRUSIVE_DETAILS_SPLIT_LIST_BASE_H +#define __CDS_INTRUSIVE_DETAILS_SPLIT_LIST_BASE_H #include <cds/intrusive/details/base.h> #include <cds/cxx11_atomic.h> @@ -803,4 +803,4 @@ namespace cds { namespace intrusive { }} // namespace cds::intrusive -#endif // #ifndef __CDS_INTRUSIVE_SPLIT_LIST_BASE_H +#endif // #ifndef __CDS_INTRUSIVE_DETAILS_SPLIT_LIST_BASE_H diff --git a/cds/intrusive/split_list.h b/cds/intrusive/split_list.h index be144f84..2f80baa3 100644 --- a/cds/intrusive/split_list.h +++ b/cds/intrusive/split_list.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_SPLIT_LIST_H #define __CDS_INTRUSIVE_SPLIT_LIST_H -#include <cds/intrusive/split_list_base.h> +#include <cds/intrusive/details/split_list_base.h> namespace cds { namespace intrusive { diff --git a/cds/intrusive/split_list_nogc.h b/cds/intrusive/split_list_nogc.h index 6195115f..a8550803 100644 --- a/cds/intrusive/split_list_nogc.h +++ b/cds/intrusive/split_list_nogc.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_SPLIT_LIST_NOGC_H #define __CDS_INTRUSIVE_SPLIT_LIST_NOGC_H -#include <cds/intrusive/split_list_base.h> +#include <cds/intrusive/details/split_list_base.h> #include <cds/gc/nogc.h> namespace cds { namespace intrusive { diff --git a/cds/intrusive/split_list_rcu.h b/cds/intrusive/split_list_rcu.h index 8951f826..315d5559 100644 --- a/cds/intrusive/split_list_rcu.h +++ b/cds/intrusive/split_list_rcu.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_SPLIT_LIST_RCU_H #define __CDS_INTRUSIVE_SPLIT_LIST_RCU_H -#include <cds/intrusive/split_list_base.h> +#include <cds/intrusive/details/split_list_base.h> #include <cds/details/binary_functor_wrapper.h> namespace cds { namespace intrusive { diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index a415fb6e..5e46dcfd 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -746,6 +746,7 @@ <ClInclude Include="..\..\..\cds\intrusive\details\queue_stat.h" /> <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h" /> <ClInclude Include="..\..\..\cds\intrusive\details\skip_list_base.h" /> + <ClInclude Include="..\..\..\cds\intrusive\details\split_list_base.h" /> <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_hp.h" /> <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" /> <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_rcu.h" /> @@ -940,7 +941,6 @@ <ClInclude Include="..\..\..\cds\intrusive\optimistic_queue.h" /> <ClInclude Include="..\..\..\cds\intrusive\segmented_queue.h" /> <ClInclude Include="..\..\..\cds\intrusive\split_list.h" /> - <ClInclude Include="..\..\..\cds\intrusive\split_list_base.h" /> <ClInclude Include="..\..\..\cds\intrusive\split_list_nogc.h" /> <ClInclude Include="..\..\..\cds\intrusive\treiber_stack.h" /> <ClInclude Include="..\..\..\cds\intrusive\tsigas_cycle_queue.h" /> diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 5bf5b4df..de1260f5 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -596,9 +596,6 @@ <ClInclude Include="..\..\..\cds\intrusive\split_list.h"> <Filter>Header Files\cds\intrusive</Filter> </ClInclude> - <ClInclude Include="..\..\..\cds\intrusive\split_list_base.h"> - <Filter>Header Files\cds\intrusive</Filter> - </ClInclude> <ClInclude Include="..\..\..\cds\intrusive\split_list_nogc.h"> <Filter>Header Files\cds\intrusive</Filter> </ClInclude> @@ -1280,5 +1277,8 @@ <ClInclude Include="..\..\..\cds\intrusive\impl\skip_list.h"> <Filter>Header Files\cds\intrusive\impl</Filter> </ClInclude> + <ClInclude Include="..\..\..\cds\intrusive\details\split_list_base.h"> + <Filter>Header Files\cds\intrusive\details</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file -- 2.34.1