Bronson's AVL-tree impl

[libcds.git] / cds / container / fcstack.h

diff --git a/cds/container/fcstack.h b/cds/container/fcstack.h
index f358968a7295e656ae3eb886f3d70580bef42254..3d3d5e4df05620ac1c9134e84a93a26ced499fc4 100644 (file)
--- a/cds/container/fcstack.h
+++ b/cds/container/fcstack.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_FCSTACK_H
-#define __CDS_CONTAINER_FCSTACK_H
+#ifndef CDSLIB_CONTAINER_FCSTACK_H
+#define CDSLIB_CONTAINER_FCSTACK_H
 
 #include <cds/algo/flat_combining.h>
 #include <cds/algo/elimination_opt.h>
@@ -47,7 +47,7 @@ namespace cds { namespace container {
         };
 
         /// FCStack type traits
-        struct traits: public cds::algo::flat_combining::type_traits
+        struct traits: public cds::algo::flat_combining::traits
         {
             typedef empty_stat      stat;   ///< Internal statistics
             static CDS_CONSTEXPR const bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination"
@@ -56,7 +56,7 @@ namespace cds { namespace container {
         /// Metafunction converting option list to traits
         /**
             \p Options are:
-            - \p opt::lock_type - mutex type, default is \p cds::lock::Spin
+            - \p opt::lock_type - mutex type, default is \p cds::sync::spin
             - \p opt::back_off - back-off strategy, defalt is \p cds::backoff::Default
             - \p opt::allocator - allocator type, default is \ref CDS_DEFAULT_ALLOCATOR
             - \p opt::stat - internal statistics, possible type: \p fcstack::stat, \p fcstack::empty_stat (the default)
@@ -357,4 +357,4 @@ namespace cds { namespace container {
     };
 }} // namespace cds::container
 
-#endif // #ifndef __CDS_CONTAINER_FCSTACK_H
+#endif // #ifndef CDSLIB_CONTAINER_FCSTACK_H