From 4b186f065d9d1395ab581b5b03d3b8ec7635828e Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 27 Sep 2014 22:44:49 +0400 Subject: [PATCH 1/1] Move lazy_list_base.h from cds/container to cds/container/details --- cds/container/{ => details}/lazy_list_base.h | 6 +++--- cds/container/lazy_kvlist_hp.h | 2 +- cds/container/lazy_kvlist_hrc.h | 2 +- cds/container/lazy_kvlist_nogc.h | 2 +- cds/container/lazy_kvlist_ptb.h | 2 +- cds/container/lazy_kvlist_rcu.h | 2 +- cds/container/lazy_list_hp.h | 2 +- cds/container/lazy_list_hrc.h | 2 +- cds/container/lazy_list_nogc.h | 2 +- cds/container/lazy_list_ptb.h | 2 +- cds/container/lazy_list_rcu.h | 2 +- projects/Win/vc12/cds.vcxproj | 2 +- projects/Win/vc12/cds.vcxproj.filters | 6 +++--- tests/test-hdr/ordered_list/hdr_lazy.h | 2 +- tests/test-hdr/ordered_list/hdr_lazy_kv.h | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) rename cds/container/{ => details}/lazy_list_base.h (96%) diff --git a/cds/container/lazy_list_base.h b/cds/container/details/lazy_list_base.h similarity index 96% rename from cds/container/lazy_list_base.h rename to cds/container/details/lazy_list_base.h index 2f99b425..9dbe0e2e 100644 --- a/cds/container/lazy_list_base.h +++ b/cds/container/details/lazy_list_base.h @@ -1,7 +1,7 @@ //$$CDS-header$$ -#ifndef __CDS_CONTAINER_LAZY_LIST_BASE_H -#define __CDS_CONTAINER_LAZY_LIST_BASE_H +#ifndef __CDS_CONTAINER_DETAILS_LAZY_LIST_BASE_H +#define __CDS_CONTAINER_DETAILS_LAZY_LIST_BASE_H #include #include @@ -124,4 +124,4 @@ namespace cds { namespace container { }} // namespace cds::container -#endif // #ifndef __CDS_CONTAINER_LAZY_LIST_BASE_H +#endif // #ifndef __CDS_CONTAINER_DETAILS_LAZY_LIST_BASE_H diff --git a/cds/container/lazy_kvlist_hp.h b/cds/container/lazy_kvlist_hp.h index d29b3c9d..83ffff44 100644 --- a/cds/container/lazy_kvlist_hp.h +++ b/cds/container/lazy_kvlist_hp.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_LAZY_KVLIST_HP_H #define __CDS_CONTAINER_LAZY_KVLIST_HP_H -#include +#include #include #include #include diff --git a/cds/container/lazy_kvlist_hrc.h b/cds/container/lazy_kvlist_hrc.h index d7a49a51..0e6a8268 100644 --- a/cds/container/lazy_kvlist_hrc.h +++ b/cds/container/lazy_kvlist_hrc.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_LAZY_KVLIST_HRC_H #define __CDS_CONTAINER_LAZY_KVLIST_HRC_H -#include +#include #include #include #include diff --git a/cds/container/lazy_kvlist_nogc.h b/cds/container/lazy_kvlist_nogc.h index 03e2b392..f05fc444 100644 --- a/cds/container/lazy_kvlist_nogc.h +++ b/cds/container/lazy_kvlist_nogc.h @@ -4,7 +4,7 @@ #define __CDS_CONTAINER_LAZY_KVLIST_NOGC_H #include -#include +#include #include #include #include diff --git a/cds/container/lazy_kvlist_ptb.h b/cds/container/lazy_kvlist_ptb.h index 6fe26378..8b448f38 100644 --- a/cds/container/lazy_kvlist_ptb.h +++ b/cds/container/lazy_kvlist_ptb.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_LAZY_KVLIST_PTB_H #define __CDS_CONTAINER_LAZY_KVLIST_PTB_H -#include +#include #include #include #include diff --git a/cds/container/lazy_kvlist_rcu.h b/cds/container/lazy_kvlist_rcu.h index e854631d..10d47ae4 100644 --- a/cds/container/lazy_kvlist_rcu.h +++ b/cds/container/lazy_kvlist_rcu.h @@ -4,7 +4,7 @@ #define __CDS_CONTAINER_LAZY_KVLIST_RCU_H #include -#include +#include #include #include #include diff --git a/cds/container/lazy_list_hp.h b/cds/container/lazy_list_hp.h index 66816a72..cbb73cdc 100644 --- a/cds/container/lazy_list_hp.h +++ b/cds/container/lazy_list_hp.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_LAZY_LIST_HP_H #define __CDS_CONTAINER_LAZY_LIST_HP_H -#include +#include #include #include #include diff --git a/cds/container/lazy_list_hrc.h b/cds/container/lazy_list_hrc.h index d63bbd15..d466fd19 100644 --- a/cds/container/lazy_list_hrc.h +++ b/cds/container/lazy_list_hrc.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_LAZY_LIST_HRC_H #define __CDS_CONTAINER_LAZY_LIST_HRC_H -#include +#include #include #include #include diff --git a/cds/container/lazy_list_nogc.h b/cds/container/lazy_list_nogc.h index 3a5fbd72..96394f17 100644 --- a/cds/container/lazy_list_nogc.h +++ b/cds/container/lazy_list_nogc.h @@ -4,7 +4,7 @@ #define __CDS_CONTAINER_LAZY_LIST_NOGC_H #include -#include +#include #include #include diff --git a/cds/container/lazy_list_ptb.h b/cds/container/lazy_list_ptb.h index 4fed1142..be535fe2 100644 --- a/cds/container/lazy_list_ptb.h +++ b/cds/container/lazy_list_ptb.h @@ -3,7 +3,7 @@ #ifndef __CDS_CONTAINER_LAZY_LIST_PTB_H #define __CDS_CONTAINER_LAZY_LIST_PTB_H -#include +#include #include #include #include diff --git a/cds/container/lazy_list_rcu.h b/cds/container/lazy_list_rcu.h index 59fa065b..745273f0 100644 --- a/cds/container/lazy_list_rcu.h +++ b/cds/container/lazy_list_rcu.h @@ -4,7 +4,7 @@ #define __CDS_CONTAINER_LAZY_LIST_RCU_H #include -#include +#include #include #include #include diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index 10a917ec..6379e67d 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -659,6 +659,7 @@ + @@ -955,7 +956,6 @@ - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 27a9dcca..d53ecdbd 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -635,9 +635,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\details + \ No newline at end of file diff --git a/tests/test-hdr/ordered_list/hdr_lazy.h b/tests/test-hdr/ordered_list/hdr_lazy.h index 2ef4073f..f7b9eb52 100644 --- a/tests/test-hdr/ordered_list/hdr_lazy.h +++ b/tests/test-hdr/ordered_list/hdr_lazy.h @@ -1,7 +1,7 @@ //$$CDS-header$$ #include "cppunit/cppunit_proxy.h" -#include +#include namespace ordlist { namespace cc = cds::container; diff --git a/tests/test-hdr/ordered_list/hdr_lazy_kv.h b/tests/test-hdr/ordered_list/hdr_lazy_kv.h index 34804647..e800f497 100644 --- a/tests/test-hdr/ordered_list/hdr_lazy_kv.h +++ b/tests/test-hdr/ordered_list/hdr_lazy_kv.h @@ -1,7 +1,7 @@ //$$CDS-header$$ #include "cppunit/cppunit_proxy.h" -#include +#include namespace ordlist { namespace cc = cds::container; -- 2.34.1