remove hp_inline.h

diff --git a/cds/gc/details/hp.h b/cds/gc/details/hp.h
index b6d052ed3ff00a2c85266eb163c514a4632474df..0bc258f35fe544c06bd37f86a6171abec718d91c 100644 (file)
--- a/cds/gc/details/hp.h
+++ b/cds/gc/details/hp.h
@@ -749,8 +749,25 @@ namespace cds {
 }}  // namespace cds::gc
 //@endcond
 
+//@cond
 // Inlines
-#include <cds/gc/details/hp_inline.h>
+namespace cds {
+    namespace gc{ namespace hp { namespace details {
+
+        inline retired_vector::retired_vector( const cds::gc::hp::GarbageCollector& HzpMgr ) CDS_NOEXCEPT
+            : m_arr( HzpMgr.getMaxRetiredPtrCount() ),
+            m_nSize(0)
+        {}
+
+        inline hp_record::hp_record( const cds::gc::hp::GarbageCollector& HzpMgr )
+            : m_hzp( HzpMgr.getHazardPointerCount() ),
+            m_arrRetired( HzpMgr )
+        {}
+
+    }}}    // namespace gc::hp::details
+}    // namespace cds
+//@endcond
+
 
 #if CDS_COMPILER == CDS_COMPILER_MSVC
 #   pragma warning(pop)

diff --git a/cds/gc/details/hp_inline.h b/cds/gc/details/hp_inline.h
deleted file mode 100644 (file)
index e4e22a8..0000000
--- a/cds/gc/details/hp_inline.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//$$CDS-header$$
-
-#ifndef __CDS_GC_DETAILS_HP_INLINE_H
-#define __CDS_GC_DETAILS_HP_INLINE_H
-
-//@cond
-namespace cds {
-    namespace gc{ namespace hp { namespace details {
-
-        /************************************************************************/
-        /* INLINES                                                              */
-        /************************************************************************/
-        inline retired_vector::retired_vector( const cds::gc::hp::GarbageCollector& HzpMgr ) CDS_NOEXCEPT
-            : m_arr( HzpMgr.getMaxRetiredPtrCount() ),
-            m_nSize(0)
-        {}
-
-        inline hp_record::hp_record( const cds::gc::hp::GarbageCollector& HzpMgr )
-            : m_hzp( HzpMgr.getHazardPointerCount() ),
-            m_arrRetired( HzpMgr )
-        {}
-
-    }}}    // namespace gc::hp::details
-}    // namespace cds
-//@endcond
-
-#endif // #ifndef __CDS_GC_DETAILS_HP_INLINE_H

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index b6db06123359c579a94f4f79e2a841372ce339a5..df4d8fb372cc8988b978f965401228e562447a75 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -737,7 +737,6 @@
     <ClInclude Include="..\..\..\cds\gc\details\dhp.h" />\r
     <ClInclude Include="..\..\..\cds\gc\details\hp.h" />\r
     <ClInclude Include="..\..\..\cds\gc\details\hp_alloc.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\details\hp_inline.h" />\r
     <ClInclude Include="..\..\..\cds\gc\details\hp_type.h" />\r
     <ClInclude Include="..\..\..\cds\gc\dhp.h" />\r
     <ClInclude Include="..\..\..\cds\gc\guarded_ptr.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 9c28764746d503c700445aa664da161564ed8785..0cbfe9dfe6ace12ec714eefab8e16fa8f815cb51 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -1157,9 +1157,6 @@
     <ClInclude Include="..\..\..\cds\gc\details\hp_alloc.h">\r
       <Filter>Header Files\cds\gc\details</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\gc\details\hp_inline.h">\r
-      <Filter>Header Files\cds\gc\details</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\gc\details\hp_type.h">\r
       <Filter>Header Files\cds\gc\details</Filter>\r
     </ClInclude>\r