Docfix

diff --git a/cds/container/details/feldman_hashmap_base.h b/cds/container/details/feldman_hashmap_base.h
index e69a82415ee540ccd7fe548181fa1f3be9c224b6..9535cb5f8a74a3a1175669090769d7e19fd42894 100644 (file)
--- a/cds/container/details/feldman_hashmap_base.h
+++ b/cds/container/details/feldman_hashmap_base.h
@@ -150,9 +150,7 @@ namespace cds { namespace container {
 
                 Value \p 0 means auto-calculated <tt>sizeof( key_type )</tt>.
             */
-            enum: size_t {
-                hash_size = 0
-            };
+            static CDS_CONSTEXPR size_t const hash_size = 0;
 
             /// Hash comparing functor
             /**

diff --git a/cds/container/details/feldman_hashset_base.h b/cds/container/details/feldman_hashset_base.h
index 3f2ab94b9a8c215f138c241339e7c2ec0e961b8f..14f3b9ea25ca4429b1b335e0de587f45e4a82338 100644 (file)
--- a/cds/container/details/feldman_hashset_base.h
+++ b/cds/container/details/feldman_hashset_base.h
@@ -80,9 +80,7 @@ namespace cds { namespace container {
             /**
                 @copydetails cds::intrusive::feldman_hashset::traits::hash_size
             */
-            enum : size_t {
-                hash_size = 0
-            };
+            static CDS_CONSTEXPR size_t const hash_size = 0;
 
             /// Hash comparing functor
             /**

diff --git a/cds/details/defs.h b/cds/details/defs.h
index 671b69614fc4e009c62d4ff5d92b392da1661c8c..0cfdd147e78cebc6fb9fc019a1e17c6b2b3e20bb 100644 (file)
--- a/cds/details/defs.h
+++ b/cds/details/defs.h
@@ -183,6 +183,13 @@
    to \p boost library root directory. The test projects search \p boost libraries in:
    - for 32bit: <tt>\$(BOOST_PATH)/stage/lib</tt>, <tt>\$(BOOST_PATH)/stage32/lib</tt>, and <tt>\$(BOOST_PATH)/bin</tt>.
    - for 64bit: <tt>\$(BOOST_PATH)/stage64/lib</tt> and <tt>\$(BOOST_PATH)/bin</tt>.
+   
+   All tests are based on googletest framework. The following environment variables specify
+   where to find gtest include and library directories:
+   - \p GTEST_ROOT - gtest root directory. <tt>\$(GTEST_ROOT)/include</tt> specifies full path to
+        gtest include files;
+   - \p GTEST_LIB64 - the path to 64bit gtest library dir;
+   - \p GTEST_LIB32 - the path to 32bit gtest library dir.
 
    \par *NIX build
 

diff --git a/cds/intrusive/details/feldman_hashset_base.h b/cds/intrusive/details/feldman_hashset_base.h
index 9d167a5b0783075e21fd7eb0ded57dabbf020386..0cd2f7aab9956c071bbc8d5bdcf9b80c1c6e3844 100644 (file)
--- a/cds/intrusive/details/feldman_hashset_base.h
+++ b/cds/intrusive/details/feldman_hashset_base.h
@@ -61,7 +61,7 @@ namespace cds { namespace intrusive {
             //@endcond
         };
 
-        // Hash size option
+        /// Hash size option
         /**
             @copydetails traits::hash_size
         */
@@ -195,9 +195,7 @@ namespace cds { namespace intrusive {
 
                 Value \p 0 means <tt>sizeof( hash_type )</tt>.
             */
-            enum : size_t {
-                hash_size = 0
-            };
+            static CDS_CONSTEXPR size_t const hash_size = 0;
 
             /// Disposer for removing data nodes
             typedef cds::intrusive::opt::v::empty_disposer disposer;