From: khizmax <libcds.dev@gmail.com>
Date: Sat, 27 Sep 2014 19:10:51 +0000 (+0400)
Subject: Move michael_map_base.h from cds/container to cds/container/details
X-Git-Tag: v2.0.0~261
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d6cf6cdfed6e799f12f765765ebe0e9718f9f471;p=libcds.git
Move michael_map_base.h from cds/container to cds/container/details
---
diff --git a/cds/container/details/michael_map_base.h b/cds/container/details/michael_map_base.h
new file mode 100644
index 00000000..976f2def
--- /dev/null
+++ b/cds/container/details/michael_map_base.h
@@ -0,0 +1,36 @@
+//$$CDS-header$$
+
+#ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
+#define __CDS_CONTAINER_MICHAEL_MAP_BASE_H
+
+#include <cds/container/michael_set_base.h>
+
+namespace cds { namespace container {
+
+ /// MichaelHashMap related definitions
+ /** @ingroup cds_nonintrusive_helper
+ */
+ namespace michael_map {
+ /// Type traits for MichaelHashMap class
+ typedef container::michael_set::type_traits type_traits;
+
+ using container::michael_set::make_traits;
+
+ //@cond
+ namespace details {
+ using michael_set::details::init_hash_bitmask;
+ }
+ //@endcond
+
+ } // namespace michael_map
+
+ //@cond
+ // Forward declarations
+ template <class GC, class OrderedList, class Traits = michael_map::type_traits>
+ class MichaelHashMap;
+ //@endcond
+
+}} // namespace cds::container
+
+
+#endif // ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
diff --git a/cds/container/michael_map.h b/cds/container/michael_map.h
index 605d6af8..6f4a387e 100644
--- a/cds/container/michael_map.h
+++ b/cds/container/michael_map.h
@@ -3,7 +3,7 @@
#ifndef __CDS_CONTAINER_MICHAEL_MAP_H
#define __CDS_CONTAINER_MICHAEL_MAP_H
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_base.h>
#include <cds/details/allocator.h>
namespace cds { namespace container {
diff --git a/cds/container/michael_map_base.h b/cds/container/michael_map_base.h
deleted file mode 100644
index 976f2def..00000000
--- a/cds/container/michael_map_base.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
-#define __CDS_CONTAINER_MICHAEL_MAP_BASE_H
-
-#include <cds/container/michael_set_base.h>
-
-namespace cds { namespace container {
-
- /// MichaelHashMap related definitions
- /** @ingroup cds_nonintrusive_helper
- */
- namespace michael_map {
- /// Type traits for MichaelHashMap class
- typedef container::michael_set::type_traits type_traits;
-
- using container::michael_set::make_traits;
-
- //@cond
- namespace details {
- using michael_set::details::init_hash_bitmask;
- }
- //@endcond
-
- } // namespace michael_map
-
- //@cond
- // Forward declarations
- template <class GC, class OrderedList, class Traits = michael_map::type_traits>
- class MichaelHashMap;
- //@endcond
-
-}} // namespace cds::container
-
-
-#endif // ifndef __CDS_CONTAINER_MICHAEL_MAP_BASE_H
diff --git a/cds/container/michael_map_nogc.h b/cds/container/michael_map_nogc.h
index c77d7f93..20a3e98a 100644
--- a/cds/container/michael_map_nogc.h
+++ b/cds/container/michael_map_nogc.h
@@ -3,7 +3,7 @@
#ifndef __CDS_CONTAINER_MICHAEL_MAP_NOGC_H
#define __CDS_CONTAINER_MICHAEL_MAP_NOGC_H
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_base.h>
#include <cds/gc/nogc.h>
#include <cds/details/allocator.h>
diff --git a/cds/container/michael_map_rcu.h b/cds/container/michael_map_rcu.h
index 4df00403..02e88613 100644
--- a/cds/container/michael_map_rcu.h
+++ b/cds/container/michael_map_rcu.h
@@ -3,7 +3,7 @@
#ifndef __CDS_CONTAINER_MICHAEL_MAP_RCU_H
#define __CDS_CONTAINER_MICHAEL_MAP_RCU_H
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_base.h>
#include <cds/details/allocator.h>
namespace cds { namespace container {
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index a4284868..dc442b0f 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -664,6 +664,7 @@
<ClInclude Include="..\..\..\cds\container\details\make_skip_list_set.h" />
<ClInclude Include="..\..\..\cds\container\details\make_split_list_set.h" />
<ClInclude Include="..\..\..\cds\container\details\michael_list_base.h" />
+ <ClInclude Include="..\..\..\cds\container\details\michael_map_base.h" />
<ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />
<ClInclude Include="..\..\..\cds\container\ellen_bintree_map_ptb.h" />
<ClInclude Include="..\..\..\cds\container\ellen_bintree_map_rcu.h" />
@@ -973,7 +974,6 @@
<ClInclude Include="..\..\..\cds\container\michael_list_nogc.h" />
<ClInclude Include="..\..\..\cds\container\michael_list_ptb.h" />
<ClInclude Include="..\..\..\cds\container\michael_map.h" />
- <ClInclude Include="..\..\..\cds\container\michael_map_base.h" />
<ClInclude Include="..\..\..\cds\container\michael_map_nogc.h" />
<ClInclude Include="..\..\..\cds\container\michael_set.h" />
<ClInclude Include="..\..\..\cds\container\michael_set_base.h" />
diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index c37e747d..fb3587cc 100644
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -674,9 +674,6 @@
<ClInclude Include="..\..\..\cds\container\michael_map.h">
<Filter>Header Files\cds\container</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\cds\container\michael_map_base.h">
- <Filter>Header Files\cds\container</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\cds\container\michael_map_nogc.h">
<Filter>Header Files\cds\container</Filter>
</ClInclude>
@@ -1283,5 +1280,8 @@
<ClInclude Include="..\..\..\cds\container\impl\michael_list.h">
<Filter>Header Files\cds\container\impl</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\cds\container\details\michael_map_base.h">
+ <Filter>Header Files\cds\container\details</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file