From 8be59b70a3697023d33f7a7d3831d2875658645a Mon Sep 17 00:00:00 2001 From: khizmax <libcds.dev@gmail.com> Date: Sat, 27 Sep 2014 18:29:35 +0400 Subject: [PATCH] Move cds/intrusive/base.h to cds/intrusive/details directory --- cds/container/base.h | 2 +- cds/intrusive/basket_queue.h | 2 +- cds/intrusive/cuckoo_set.h | 2 +- cds/intrusive/{ => details}/base.h | 6 +++--- cds/intrusive/details/ellen_bintree_base.h | 2 +- cds/intrusive/details/single_link_struct.h | 2 +- cds/intrusive/lazy_list_base.h | 2 +- cds/intrusive/michael_list_base.h | 2 +- cds/intrusive/michael_set_base.h | 2 +- cds/intrusive/mspriority_queue.h | 2 +- cds/intrusive/optimistic_queue.h | 2 +- cds/intrusive/segmented_queue.h | 2 +- cds/intrusive/skip_list_base.h | 2 +- cds/intrusive/split_list_base.h | 2 +- cds/intrusive/striped_set.h | 2 +- cds/intrusive/tsigas_cycle_queue.h | 2 +- cds/intrusive/vyukov_mpmc_cycle_queue.h | 2 +- projects/Win/vc12/cds.vcxproj | 2 +- projects/Win/vc12/cds.vcxproj.filters | 6 +++--- tests/test-hdr/queue/hdr_intrusive_msqueue.h | 2 +- tests/test-hdr/queue/hdr_intrusive_segmented_queue.h | 2 +- tests/test-hdr/queue/hdr_segmented_queue.h | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) rename cds/intrusive/{ => details}/base.h (97%) diff --git a/cds/container/base.h b/cds/container/base.h index bd6ed3e0..0a8372fa 100644 --- a/cds/container/base.h +++ b/cds/container/base.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_BASE_H #define __CDS_CONTAINER_BASE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/details/allocator.h> namespace cds { diff --git a/cds/intrusive/basket_queue.h b/cds/intrusive/basket_queue.h index 3a2d4aed..331127a0 100644 --- a/cds/intrusive/basket_queue.h +++ b/cds/intrusive/basket_queue.h @@ -4,7 +4,7 @@ #define __CDS_INTRUSIVE_BASKET_QUEUE_H #include <type_traits> -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/details/marked_ptr.h> #include <cds/intrusive/queue_stat.h> #include <cds/intrusive/details/single_link_struct.h> diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h index 790a7852..87404c7a 100644 --- a/cds/intrusive/cuckoo_set.h +++ b/cds/intrusive/cuckoo_set.h @@ -6,7 +6,7 @@ #include <memory> #include <type_traits> #include <mutex> -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/opt/compare.h> #include <cds/opt/hash.h> #include <cds/lock/array.h> diff --git a/cds/intrusive/base.h b/cds/intrusive/details/base.h similarity index 97% rename from cds/intrusive/base.h rename to cds/intrusive/details/base.h index 8fa8e4f6..0845569c 100644 --- a/cds/intrusive/base.h +++ b/cds/intrusive/details/base.h @@ -1,7 +1,7 @@ //$$CDS-header$$ -#ifndef __CDS_INTRUSIVE_BASE_H -#define __CDS_INTRUSIVE_BASE_H +#ifndef __CDS_INTRUSIVE_DETAILS_BASE_H +#define __CDS_INTRUSIVE_DETAILS_BASE_H #include <cds/intrusive/node_traits.h> #include <cds/details/allocator.h> @@ -157,4 +157,4 @@ namespace intrusive { }} // namespace cds::intrusuve -#endif // #ifndef __CDS_INTRUSIVE_BASE_H +#endif // #ifndef __CDS_INTRUSIVE_DETAILS_BASE_H diff --git a/cds/intrusive/details/ellen_bintree_base.h b/cds/intrusive/details/ellen_bintree_base.h index f35ac11b..644c5b76 100644 --- a/cds/intrusive/details/ellen_bintree_base.h +++ b/cds/intrusive/details/ellen_bintree_base.h @@ -4,7 +4,7 @@ #define __CDS_INTRUSIVE_DETAILS_ELLEN_BINTREE_BASE_H #include <type_traits> -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/opt/options.h> #include <cds/urcu/options.h> #include <cds/details/marked_ptr.h> diff --git a/cds/intrusive/details/single_link_struct.h b/cds/intrusive/details/single_link_struct.h index d3e3cc85..86363980 100644 --- a/cds/intrusive/details/single_link_struct.h +++ b/cds/intrusive/details/single_link_struct.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_DETAILS_SINGLE_LINK_STRUCT_H #define __CDS_INTRUSIVE_DETAILS_SINGLE_LINK_STRUCT_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/gc/default_gc.h> #include <cds/cxx11_atomic.h> #include <cds/gc/hrc.h> diff --git a/cds/intrusive/lazy_list_base.h b/cds/intrusive/lazy_list_base.h index 3afdef67..c4c12cbd 100644 --- a/cds/intrusive/lazy_list_base.h +++ b/cds/intrusive/lazy_list_base.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_LAZY_LIST_BASE_H #define __CDS_INTRUSIVE_LAZY_LIST_BASE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/opt/compare.h> #include <cds/details/marked_ptr.h> #include <cds/ref.h> diff --git a/cds/intrusive/michael_list_base.h b/cds/intrusive/michael_list_base.h index 68427162..33861c60 100644 --- a/cds/intrusive/michael_list_base.h +++ b/cds/intrusive/michael_list_base.h @@ -4,7 +4,7 @@ #define __CDS_INTRUSIVE_MICHAEL_LIST_BASE_H #include <type_traits> -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/opt/compare.h> #include <cds/cxx11_atomic.h> #include <cds/details/marked_ptr.h> diff --git a/cds/intrusive/michael_set_base.h b/cds/intrusive/michael_set_base.h index f68b5a3b..f0fe5946 100644 --- a/cds/intrusive/michael_set_base.h +++ b/cds/intrusive/michael_set_base.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_MICHAEL_SET_BASE_H #define __CDS_INTRUSIVE_MICHAEL_SET_BASE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/opt/compare.h> #include <cds/opt/hash.h> #include <cds/algo/bitop.h> diff --git a/cds/intrusive/mspriority_queue.h b/cds/intrusive/mspriority_queue.h index bd94dab3..ffe3adb2 100644 --- a/cds/intrusive/mspriority_queue.h +++ b/cds/intrusive/mspriority_queue.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_MSPRIORITY_QUEUE_H #define __CDS_INTRUSIVE_MSPRIORITY_QUEUE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/lock/spinlock.h> #include <cds/os/thread.h> #include <cds/details/bit_reverse_counter.h> diff --git a/cds/intrusive/optimistic_queue.h b/cds/intrusive/optimistic_queue.h index e1d57948..d0d3cc9e 100644 --- a/cds/intrusive/optimistic_queue.h +++ b/cds/intrusive/optimistic_queue.h @@ -4,7 +4,7 @@ #define __CDS_INTRUSIVE_OPTIMISTIC_QUEUE_H #include <type_traits> -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/cxx11_atomic.h> #include <cds/gc/default_gc.h> #include <cds/gc/hrc/gc_fwd.h> diff --git a/cds/intrusive/segmented_queue.h b/cds/intrusive/segmented_queue.h index 2376e489..36e8abf1 100644 --- a/cds/intrusive/segmented_queue.h +++ b/cds/intrusive/segmented_queue.h @@ -4,7 +4,7 @@ #define __CDS_INTRUSIVE_SEGMENTED_QUEUE_H #include <mutex> -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/details/marked_ptr.h> #include <cds/algo/int_algo.h> #include <cds/lock/spinlock.h> diff --git a/cds/intrusive/skip_list_base.h b/cds/intrusive/skip_list_base.h index 5e046961..5419dc4e 100644 --- a/cds/intrusive/skip_list_base.h +++ b/cds/intrusive/skip_list_base.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_SKIP_LIST_BASE_H #define __CDS_INTRUSIVE_SKIP_LIST_BASE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/details/marked_ptr.h> #include <cds/algo/bitop.h> #include <cds/os/timer.h> diff --git a/cds/intrusive/split_list_base.h b/cds/intrusive/split_list_base.h index c8c99ed3..1c86abcc 100644 --- a/cds/intrusive/split_list_base.h +++ b/cds/intrusive/split_list_base.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_SPLIT_LIST_BASE_H #define __CDS_INTRUSIVE_SPLIT_LIST_BASE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/cxx11_atomic.h> #include <cds/details/allocator.h> #include <cds/algo/int_algo.h> diff --git a/cds/intrusive/striped_set.h b/cds/intrusive/striped_set.h index f038f311..61feae6f 100644 --- a/cds/intrusive/striped_set.h +++ b/cds/intrusive/striped_set.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_STRIPED_SET_H #define __CDS_INTRUSIVE_STRIPED_SET_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/intrusive/striped_set/adapter.h> #include <cds/intrusive/striped_set/striping_policy.h> diff --git a/cds/intrusive/tsigas_cycle_queue.h b/cds/intrusive/tsigas_cycle_queue.h index aeb22f56..5d6108ca 100644 --- a/cds/intrusive/tsigas_cycle_queue.h +++ b/cds/intrusive/tsigas_cycle_queue.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_TSIGAS_CYCLE_QUEUE_H #define __CDS_INTRUSIVE_TSIGAS_CYCLE_QUEUE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/cxx11_atomic.h> #include <cds/details/bounded_container.h> #include <cds/opt/buffer.h> diff --git a/cds/intrusive/vyukov_mpmc_cycle_queue.h b/cds/intrusive/vyukov_mpmc_cycle_queue.h index 9355e0e0..165cdb46 100644 --- a/cds/intrusive/vyukov_mpmc_cycle_queue.h +++ b/cds/intrusive/vyukov_mpmc_cycle_queue.h @@ -3,7 +3,7 @@ #ifndef __CDS_INTRUSIVE_VYUKOV_MPMC_CYCLE_QUEUE_H #define __CDS_INTRUSIVE_VYUKOV_MPMC_CYCLE_QUEUE_H -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/container/vyukov_mpmc_cycle_queue.h> namespace cds { namespace intrusive { diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index b1f56060..bcd93d76 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -736,6 +736,7 @@ <ClInclude Include="..\..\..\cds\gc\ptb_impl.h" /> <ClInclude Include="..\..\..\cds\intrusive\basket_queue.h" /> <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h" /> + <ClInclude Include="..\..\..\cds\intrusive\details\base.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" /> @@ -916,7 +917,6 @@ <ClInclude Include="..\..\..\cds\opt\options.h" /> <ClInclude Include="..\..\..\cds\opt\permutation.h" /> <ClInclude Include="..\..\..\cds\opt\value_cleaner.h" /> - <ClInclude Include="..\..\..\cds\intrusive\base.h" /> <ClInclude Include="..\..\..\cds\intrusive\fcqueue.h" /> <ClInclude Include="..\..\..\cds\intrusive\fcstack.h" /> <ClInclude Include="..\..\..\cds\intrusive\lazy_list_base.h" /> diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 27e6442c..ebbbe23d 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -542,9 +542,6 @@ <ClInclude Include="..\..\..\cds\opt\value_cleaner.h"> <Filter>Header Files\cds\opt</Filter> </ClInclude> - <ClInclude Include="..\..\..\cds\intrusive\base.h"> - <Filter>Header Files\cds\intrusive</Filter> - </ClInclude> <ClInclude Include="..\..\..\cds\intrusive\fcqueue.h"> <Filter>Header Files\cds\intrusive</Filter> </ClInclude> @@ -1277,5 +1274,8 @@ <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h"> <Filter>Header Files\cds\intrusive\details</Filter> </ClInclude> + <ClInclude Include="..\..\..\cds\intrusive\details\base.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_msqueue.h b/tests/test-hdr/queue/hdr_intrusive_msqueue.h index 2bac05fa..0b3cb860 100644 --- a/tests/test-hdr/queue/hdr_intrusive_msqueue.h +++ b/tests/test-hdr/queue/hdr_intrusive_msqueue.h @@ -1,7 +1,7 @@ //$$CDS-header$$ #include "cppunit/cppunit_proxy.h" -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> namespace queue { namespace ci = cds::intrusive; diff --git a/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h b/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h index 2881b521..a448c3ee 100644 --- a/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h +++ b/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h @@ -4,7 +4,7 @@ #define __CDSHDR_QUEUE_INTRUSIVE_SEGMENTED_QUEUE_H #include "cppunit/cppunit_proxy.h" -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include "size_check.h" namespace queue { diff --git a/tests/test-hdr/queue/hdr_segmented_queue.h b/tests/test-hdr/queue/hdr_segmented_queue.h index d1e42919..633358b9 100644 --- a/tests/test-hdr/queue/hdr_segmented_queue.h +++ b/tests/test-hdr/queue/hdr_segmented_queue.h @@ -4,7 +4,7 @@ #define __CDSHDR_QUEUE_SEGMENTED_QUEUE_H #include "cppunit/cppunit_proxy.h" -#include <cds/intrusive/base.h> +#include <cds/intrusive/details/base.h> #include <cds/ref.h> #include "size_check.h" -- 2.34.1