From 97164038c234e55f3819fe3d1e3be612b45aee07 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 27 Sep 2014 23:08:14 +0400 Subject: [PATCH] Rename cds/container/michael_list_impl.h to cds/container/impl/michael_list.h --- cds/container/impl/lazy_list.h | 7 ------- cds/container/impl/michael_kvlist.h | 7 ------- cds/container/{michael_list_impl.h => impl/michael_list.h} | 7 +++---- cds/container/michael_list_hp.h | 2 +- cds/container/michael_list_hrc.h | 2 +- cds/container/michael_list_ptb.h | 2 +- projects/Win/vc12/cds.vcxproj | 2 +- projects/Win/vc12/cds.vcxproj.filters | 6 +++--- 8 files changed, 10 insertions(+), 25 deletions(-) rename cds/container/{michael_list_impl.h => impl/michael_list.h} (99%) diff --git a/cds/container/impl/lazy_list.h b/cds/container/impl/lazy_list.h index b56a9442..57777ddd 100644 --- a/cds/container/impl/lazy_list.h +++ b/cds/container/impl/lazy_list.h @@ -37,12 +37,6 @@ namespace cds { namespace container { The key is a function (or a part) of type \p T, and this function is specified by Traits::compare functor 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 @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. It is possible to declare option-based list with cds::container::lazy_list::make_traits metafunction istead of \p Traits template @@ -99,7 +93,6 @@ namespace cds { namespace container { You should include appropriate .h-file depending on GC you are using: - for gc::HP: \code #include \endcode - for gc::PTB: \code #include \endcode - - for gc::HRC: \code #include \endcode - for \ref cds_urcu_desc "RCU": \code #include \endcode - for gc::nogc: \code #include \endcode */ diff --git a/cds/container/impl/michael_kvlist.h b/cds/container/impl/michael_kvlist.h index 77190653..d9dffc90 100644 --- a/cds/container/impl/michael_kvlist.h +++ b/cds/container/impl/michael_kvlist.h @@ -27,12 +27,6 @@ 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 @@ -84,7 +78,6 @@ namespace cds { namespace container { You should include appropriate .h-file depending on GC you are using: - for gc::HP: \code #include \endcode - for gc::PTB: \code #include \endcode - - for gc::HRC: \code #include \endcode - for \ref cds_urcu_desc "RCU": \code #include \endcode - for gc::nogc: \code #include \endcode */ diff --git a/cds/container/michael_list_impl.h b/cds/container/impl/michael_list.h similarity index 99% rename from cds/container/michael_list_impl.h rename to cds/container/impl/michael_list.h index 60d37b59..4bbf0193 100644 --- a/cds/container/michael_list_impl.h +++ b/cds/container/impl/michael_list.h @@ -1,7 +1,7 @@ //$$CDS-header$$ -#ifndef __CDS_CONTAINER_MICHAEL_LIST_IMPL_H -#define __CDS_CONTAINER_MICHAEL_LIST_IMPL_H +#ifndef __CDS_CONTAINER_IMPL_MICHAEL_LIST_H +#define __CDS_CONTAINER_IMPL_MICHAEL_LIST_H #include #include @@ -83,7 +83,6 @@ namespace cds { namespace container { You should include appropriate .h-file depending on GC you are using: - for gc::HP: \code #include \endcode - for gc::PTB: \code #include \endcode - - for gc::HRC: \code #include \endcode - for \ref cds_urcu_desc "RCU": \code #include \endcode - for gc::nogc: \code #include \endcode */ @@ -797,4 +796,4 @@ namespace cds { namespace container { }} // namespace cds::container -#endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_IMPL_H +#endif // #ifndef __CDS_CONTAINER_IMPL_MICHAEL_LIST_H diff --git a/cds/container/michael_list_hp.h b/cds/container/michael_list_hp.h index 2ef582ac..7e28353d 100644 --- a/cds/container/michael_list_hp.h +++ b/cds/container/michael_list_hp.h @@ -6,6 +6,6 @@ #include #include #include -#include +#include #endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_HP_H diff --git a/cds/container/michael_list_hrc.h b/cds/container/michael_list_hrc.h index 4df2ee67..ce9b1f54 100644 --- a/cds/container/michael_list_hrc.h +++ b/cds/container/michael_list_hrc.h @@ -6,6 +6,6 @@ #include #include #include -#include +#include #endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_HRC_H diff --git a/cds/container/michael_list_ptb.h b/cds/container/michael_list_ptb.h index 546ec9af..c63ec6ba 100644 --- a/cds/container/michael_list_ptb.h +++ b/cds/container/michael_list_ptb.h @@ -6,6 +6,6 @@ #include #include #include -#include +#include #endif // #ifndef __CDS_CONTAINER_MICHAEL_LIST_PTB_H diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index 2bea9fa4..a4284868 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -675,6 +675,7 @@ + @@ -969,7 +970,6 @@ - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 528e827d..c37e747d 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -665,9 +665,6 @@ Header Files\cds\container - - Header Files\cds\container - Header Files\cds\container @@ -1283,5 +1280,8 @@ Header Files\cds\container\details + + Header Files\cds\container\impl + \ No newline at end of file -- 2.34.1