From 4ae6903f13e8f8a62257bc45584100283e0a8ce5 Mon Sep 17 00:00:00 2001 From: greg Date: Mon, 30 Dec 2019 19:19:11 -0500 Subject: [PATCH] cleanup some warnings in btree_test.cc --- parallel_hashmap/btree.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/parallel_hashmap/btree.h b/parallel_hashmap/btree.h index 0fc7c49..084e987 100644 --- a/parallel_hashmap/btree.h +++ b/parallel_hashmap/btree.h @@ -246,7 +246,7 @@ namespace phmap { #define PHMAP_COMPARE_INLINE_BASECLASS_DECL(name) #define PHMAP_COMPARE_INLINE_SUBCLASS_DECL(type, name) \ - static const type name + static const type name; #define PHMAP_COMPARE_INLINE_INIT(type, name, init) \ inline constexpr type type::name(init) @@ -313,8 +313,8 @@ namespace phmap { friend struct compare_internal::weak_equality_base; public: - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, equivalent); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, nonequivalent); + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, equivalent) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, nonequivalent) // Comparisons friend constexpr bool operator==( @@ -349,10 +349,10 @@ namespace phmap { friend struct compare_internal::strong_equality_base; public: - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equal); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequal); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equivalent); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequivalent); + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equal) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequal) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equivalent) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequivalent) // Conversion constexpr operator weak_equality() const noexcept { // NOLINT @@ -405,10 +405,10 @@ namespace phmap { } public: - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered); + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered) // Conversion constexpr operator weak_equality() const noexcept { // NOLINT @@ -486,9 +486,9 @@ namespace phmap { friend struct compare_internal::weak_ordering_base; public: - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater); + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater) // Conversions constexpr operator weak_equality() const noexcept { // NOLINT @@ -569,10 +569,10 @@ namespace phmap { friend struct compare_internal::strong_ordering_base; public: - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent); - PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater); + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent) + PHMAP_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater) // Conversions constexpr operator weak_equality() const noexcept { // NOLINT