From b63a3a291c9f9355ff2f6c8926bede9fa560fdcb Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 27 Sep 2014 23:00:02 +0400 Subject: [PATCH] Rename cds/container/michael_kvlist_impl.h to cds/container/impl/michael_kvlist.h --- cds/container/impl/lazy_list.h | 5 +++-- .../{michael_kvlist_impl.h => impl/michael_kvlist.h} | 12 +++++++++--- cds/container/michael_kvlist_hp.h | 2 +- cds/container/michael_kvlist_hrc.h | 2 +- cds/container/michael_kvlist_ptb.h | 2 +- projects/Win/vc12/cds.vcxproj | 2 +- projects/Win/vc12/cds.vcxproj.filters | 6 +++--- 7 files changed, 19 insertions(+), 12 deletions(-) rename cds/container/{michael_kvlist_impl.h => impl/michael_kvlist.h} (97%) diff --git a/cds/container/impl/lazy_list.h b/cds/container/impl/lazy_list.h index 237f64b7..b56a9442 100644 --- a/cds/container/impl/lazy_list.h +++ b/cds/container/impl/lazy_list.h @@ -38,9 +38,10 @@ namespace cds { namespace container { or Traits::less predicate. You don't need to include . Instead, you should do: - - - for gc::HP-based lazy list - - - for gc::PTB-based lazy list + - - for gc::HP based lazy list + - - for gc::PTB based lazy list - - for @ref cds_urcu_desc "RCU" based lazy list + - - for append-only based lazy list LazyKVList is a key-value version of lazy non-intrusive list that is closer to the C++ std library approach. diff --git a/cds/container/michael_kvlist_impl.h b/cds/container/impl/michael_kvlist.h similarity index 97% rename from cds/container/michael_kvlist_impl.h rename to cds/container/impl/michael_kvlist.h index f9ae7ee7..77190653 100644 --- a/cds/container/michael_kvlist_impl.h +++ b/cds/container/impl/michael_kvlist.h @@ -1,7 +1,7 @@ //$$CDS-header$$ -#ifndef __CDS_CONTAINER_MICHAEL_KVLIST_IMPL_H -#define __CDS_CONTAINER_MICHAEL_KVLIST_IMPL_H +#ifndef __CDS_CONTAINER_IMPL_MICHAEL_KVLIST_H +#define __CDS_CONTAINER_IMPL_MICHAEL_KVLIST_H #include #include @@ -27,6 +27,12 @@ namespace cds { namespace container { - \p Value - value type stored in a list - \p Traits - type traits, default is michael_list::type_traits + You don't need to include . Instead, you should include: + - - for gc::HP based Michael's key-value list + - - for gc::PTB based Michael's key-value list + - - for for @ref cds_urcu_desc "RCU" based Michael's key-value list + - - for append-only Michael's key-value list + It is possible to declare option-based list with cds::container::michael_list::make_traits metafunction istead of \p Traits template argument. For example, the following traits-based declaration of gc::HP Michael's list \code @@ -812,4 +818,4 @@ namespace cds { namespace container { }} // namespace cds::container -#endif // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_IMPL_H +#endif // #ifndef __CDS_CONTAINER_IMPL_MICHAEL_KVLIST_H diff --git a/cds/container/michael_kvlist_hp.h b/cds/container/michael_kvlist_hp.h index 4f315b77..59056ed6 100644 --- a/cds/container/michael_kvlist_hp.h +++ b/cds/container/michael_kvlist_hp.h @@ -6,6 +6,6 @@ #include #include #include -#include +#include #endif // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_HP_H diff --git a/cds/container/michael_kvlist_hrc.h b/cds/container/michael_kvlist_hrc.h index 50143e54..9a6803bb 100644 --- a/cds/container/michael_kvlist_hrc.h +++ b/cds/container/michael_kvlist_hrc.h @@ -6,6 +6,6 @@ #include #include #include -#include +#include #endif // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_HRC_H diff --git a/cds/container/michael_kvlist_ptb.h b/cds/container/michael_kvlist_ptb.h index 04170ada..43bc8682 100644 --- a/cds/container/michael_kvlist_ptb.h +++ b/cds/container/michael_kvlist_ptb.h @@ -6,6 +6,6 @@ #include #include #include -#include +#include #endif // #ifndef __CDS_CONTAINER_MICHAEL_KVLIST_PTB_H diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index dffb311b..1c1cacdf 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -673,6 +673,7 @@ + @@ -963,7 +964,6 @@ - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 82486eb2..cbc8fd0f 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -653,9 +653,6 @@ Header Files\cds\container - - Header Files\cds\container - Header Files\cds\container @@ -1283,5 +1280,8 @@ Header Files\cds\container\impl + + Header Files\cds\container\impl + \ No newline at end of file -- 2.34.1