Merge branch 'integration' into dev

[libcds.git] / cds / threading / model.h

diff --git a/cds/threading/model.h b/cds/threading/model.h
index 3a7bd340ce6e0c9739f4a36b8f311dca191ab0df..ab45f24cf1cef8daf23646274f99bb028c270539 100644 (file)
--- a/cds/threading/model.h
+++ b/cds/threading/model.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_THREADING_MODEL_H
-#define __CDS_THREADING_MODEL_H
+#ifndef CDSLIB_THREADING_MODEL_H
+#define CDSLIB_THREADING_MODEL_H
 
 #include <cds/threading/details/_common.h>
 #include <cds/user_setup/threading.h>
@@ -31,17 +31,17 @@ namespace cds { namespace threading {
         return Manager::getHZPGC();
     }
 
-    /// Get cds::gc::PTB thread GC implementation for current thread
+    /// Get cds::gc::DHP thread GC implementation for current thread
     /**
         The object returned may be uninitialized if you did not call attachThread in the beginning of thread execution
-        or if you did not use cds::gc::PTB.
-        To initialize cds::gc::PTB GC you must constuct cds::gc::PTB object in the beginning of your application,
+        or if you did not use cds::gc::DHP.
+        To initialize cds::gc::DHP GC you must constuct cds::gc::DHP object in the beginning of your application,
         see \ref cds_how_to_use "How to use libcds"
     */
     template <>
-    inline cds::gc::PTB::thread_gc_impl&   getGC<cds::gc::PTB>()
+    inline cds::gc::DHP::thread_gc_impl&   getGC<cds::gc::DHP>()
     {
-        return Manager::getPTBGC();
+        return Manager::getDHPGC();
     }
 
     //@cond
@@ -83,4 +83,4 @@ namespace cds { namespace threading {
 
 }} // namespace cds::threading
 
-#endif // #ifndef __CDS_THREADING_MODEL_H
+#endif // #ifndef CDSLIB_THREADING_MODEL_H