From c15bac0dec480a3c56fd1ec83e065854d5711907 Mon Sep 17 00:00:00 2001
From: greg <greg7mdp@gmail.com>
Date: Mon, 30 Dec 2019 14:53:03 -0500
Subject: [PATCH] fix compilation issue with btree tests

---
 parallel_hashmap/btree.h | 36 ++++++++++++++++++------------------
 tests/btree_test.cc      | 14 +++++++-------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/parallel_hashmap/btree.h b/parallel_hashmap/btree.h
index a9fcb93..0fc7c49 100644
--- a/parallel_hashmap/btree.h
+++ b/parallel_hashmap/btree.h
@@ -254,7 +254,7 @@ namespace phmap {
 #else  // __cpp_inline_variables
 
 #define PHMAP_COMPARE_INLINE_BASECLASS_DECL(name)   \
-        static const T name
+        static const T name;
 
 #define PHMAP_COMPARE_INLINE_SUBCLASS_DECL(type, name)
 
@@ -269,39 +269,39 @@ namespace phmap {
         // aren't available in C++11).
         template <typename T>
         struct weak_equality_base {
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(nonequivalent);
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(nonequivalent)
         };
 
         template <typename T>
         struct strong_equality_base {
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equal);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(nonequal);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(nonequivalent);
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equal)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(nonequal)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(nonequivalent)
         };
 
         template <typename T>
         struct partial_ordering_base {
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(less);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(greater);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(unordered);
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(less)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(greater)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(unordered)
         };
 
         template <typename T>
         struct weak_ordering_base {
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(less);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(greater);
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(less)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(greater)
         };
 
         template <typename T>
         struct strong_ordering_base {
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(less);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equal);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent);
-            PHMAP_COMPARE_INLINE_BASECLASS_DECL(greater);
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(less)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equal)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(equivalent)
+            PHMAP_COMPARE_INLINE_BASECLASS_DECL(greater)
         };
 
     }  // namespace compare_internal
diff --git a/tests/btree_test.cc b/tests/btree_test.cc
index 775ebb3..b69578e 100644
--- a/tests/btree_test.cc
+++ b/tests/btree_test.cc
@@ -1007,8 +1007,8 @@ namespace {
             // `std::string` has heterogeneous support.
             btree_set<std::string> s = {"A"};
 #if PHMAP_HAVE_STD_STRING_VIEW
-            EXPECT_EQ(s.begin(), s.find(phmap::string_view("A")));
-            EXPECT_TRUE(s.contains(phmap::string_view("A")));
+            EXPECT_EQ(s.begin(), s.find(std::string_view("A")));
+            EXPECT_TRUE(s.contains(std::string_view("A")));
 #endif
         }
     }
@@ -1082,8 +1082,8 @@ namespace {
         explicit SubstringLess(int length) : n(length) {}
         bool operator()(const std::string &a, const std::string &b) const {
 #if PHMAP_HAVE_STD_STRING_VIEW
-            return phmap::string_view(a).substr(0, n) <
-                phmap::string_view(b).substr(0, n);
+            return std::string_view(a).substr(0, n) <
+                std::string_view(b).substr(0, n);
 #else
             return a.substr(0, n) < b.substr(0, n);
 #endif
@@ -1288,9 +1288,9 @@ namespace {
         AssertKeyCompareToAdapted<std::less<std::string>, std::string>();
         AssertKeyCompareToAdapted<std::greater<std::string>, std::string>();
 #if PHMAP_HAVE_STD_STRING_VIEW
-        AssertKeyCompareToAdapted<std::less<phmap::string_view>, phmap::string_view>();
-        AssertKeyCompareToAdapted<std::greater<phmap::string_view>,
-                                  phmap::string_view>();
+        AssertKeyCompareToAdapted<std::less<std::string_view>, std::string_view>();
+        AssertKeyCompareToAdapted<std::greater<std::string_view>,
+                                  std::string_view>();
 #endif
         AssertKeyCompareToNotAdapted<std::less<int>, int>();
         AssertKeyCompareToNotAdapted<std::greater<int>, int>();