remove hp_inline.h
authorkhizmax <libcds.dev@gmail.com>
Sun, 16 Nov 2014 19:27:07 +0000 (22:27 +0300)
committerkhizmax <libcds.dev@gmail.com>
Sun, 16 Nov 2014 19:27:07 +0000 (22:27 +0300)
cds/gc/details/hp.h
cds/gc/details/hp_inline.h [deleted file]
projects/Win/vc12/cds.vcxproj
projects/Win/vc12/cds.vcxproj.filters

index b6d052e..0bc258f 100644 (file)
@@ -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
+++ /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
index b6db061..df4d8fb 100644 (file)
     <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
index 9c28764..0cbfe9d 100644 (file)
     <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