From: khizmax <libcds.dev@gmail.com>
Date: Sat, 12 Nov 2016 09:26:01 +0000 (+0300)
Subject: Docfix
X-Git-Tag: v2.2.0~69
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=f9a3482c25de1eb0db20e2835488096ac23b2098;ds=sidebyside

Docfix
---

diff --git a/cds/container/details/feldman_hashmap_base.h b/cds/container/details/feldman_hashmap_base.h
index e69a8241..9535cb5f 100644
--- 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 3f2ab94b..14f3b9ea 100644
--- 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 671b6961..0cfdd147 100644
--- 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 9d167a5b..0cd2f7aa 100644
--- 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;