Merge branch 'integration' into dev

[libcds.git] / cds / gc / details / hp_alloc.h

diff --git a/cds/gc/details/hp_alloc.h b/cds/gc/details/hp_alloc.h
index ae0ac4098ef564730647f499e71dbb67c9d2d3bb..888e7159b392bd9a2354931ebc166ca8d30868c9 100644 (file)
--- a/cds/gc/details/hp_alloc.h
+++ b/cds/gc/details/hp_alloc.h
@@ -1,9 +1,9 @@
 //$$CDS-header$$
 
-#ifndef __CDS_GC_DETAILS_HP_ALLOC_H
-#define __CDS_GC_DETAILS_HP_ALLOC_H
+#ifndef CDSLIB_GC_DETAILS_HP_ALLOC_H
+#define CDSLIB_GC_DETAILS_HP_ALLOC_H
 
-#include <cds/cxx11_atomic.h>
+#include <cds/algo/atomic.h>
 #include <cds/details/allocator.h>
 #include <cds/gc/details/hp_type.h>
 
@@ -305,4 +305,4 @@ namespace cds {
 }   // namespace cds
 //@endcond
 
-#endif // #ifndef __CDS_GC_DETAILS_HP_ALLOC_H
+#endif // #ifndef CDSLIB_GC_DETAILS_HP_ALLOC_H