From f9a3482c25de1eb0db20e2835488096ac23b2098 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 12 Nov 2016 12:26:01 +0300 Subject: [PATCH] Docfix --- cds/container/details/feldman_hashmap_base.h | 4 +--- cds/container/details/feldman_hashset_base.h | 4 +--- cds/details/defs.h | 7 +++++++ cds/intrusive/details/feldman_hashset_base.h | 6 ++---- 4 files changed, 11 insertions(+), 10 deletions(-) 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 sizeof( key_type ). */ - 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: \$(BOOST_PATH)/stage/lib, \$(BOOST_PATH)/stage32/lib, and \$(BOOST_PATH)/bin. - for 64bit: \$(BOOST_PATH)/stage64/lib and \$(BOOST_PATH)/bin. + + 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. \$(GTEST_ROOT)/include 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 sizeof( hash_type ). */ - 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; -- 2.34.1