From b66fe51566292ea9824906e938afbcf39546ebbc Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sat, 6 Jun 2020 00:15:58 +0300
Subject: [PATCH] Avoid g++ 4.4 conflict between hash() and boost::hash

---
 test/owner_hash_test.cpp | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/test/owner_hash_test.cpp b/test/owner_hash_test.cpp
index 15da1b6..3d8bb8c 100644
--- a/test/owner_hash_test.cpp
+++ b/test/owner_hash_test.cpp
@@ -7,7 +7,7 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-template<class T> std::size_t hash( T const& t )
+template<class T> std::size_t hash_( T const& t )
 {
     return boost::owner_hash<T>()( t );
 }
@@ -17,57 +17,57 @@ int main()
     boost::shared_ptr<int> p1( new int );
     boost::shared_ptr<int> p2( p1 );
 
-    BOOST_TEST_EQ( hash( p1 ), hash( p2 ) );
+    BOOST_TEST_EQ( hash_( p1 ), hash_( p2 ) );
 
     boost::shared_ptr<int> p3( new int );
 
-    BOOST_TEST_NE( hash( p1 ), hash( p3 ) );
+    BOOST_TEST_NE( hash_( p1 ), hash_( p3 ) );
 
     boost::shared_ptr<int> p4;
     boost::shared_ptr<int> p5;
 
-    BOOST_TEST_EQ( hash( p4 ), hash( p5 ) );
-    BOOST_TEST_NE( hash( p4 ), hash( p3 ) );
+    BOOST_TEST_EQ( hash_( p4 ), hash_( p5 ) );
+    BOOST_TEST_NE( hash_( p4 ), hash_( p3 ) );
 
     boost::shared_ptr<int> p6( static_cast<int*>(0) );
 
-    BOOST_TEST_NE( hash( p4 ), hash( p6 ) );
+    BOOST_TEST_NE( hash_( p4 ), hash_( p6 ) );
 
     boost::shared_ptr<void> p7( p1 );
 
-    BOOST_TEST_EQ( hash( p1 ), hash( p7 ) );
+    BOOST_TEST_EQ( hash_( p1 ), hash_( p7 ) );
 
     boost::shared_ptr<void> p8;
 
-    BOOST_TEST_NE( hash( p1 ), hash( p8 ) );
-    BOOST_TEST_EQ( hash( p4 ), hash( p8 ) );
+    BOOST_TEST_NE( hash_( p1 ), hash_( p8 ) );
+    BOOST_TEST_EQ( hash_( p4 ), hash_( p8 ) );
 
     boost::weak_ptr<int> q1( p1 );
 
-    BOOST_TEST_EQ( hash( p1 ), hash( q1 ) );
+    BOOST_TEST_EQ( hash_( p1 ), hash_( q1 ) );
 
     boost::weak_ptr<int> q2( p1 );
 
-    BOOST_TEST_EQ( hash( q1 ), hash( q2 ) );
+    BOOST_TEST_EQ( hash_( q1 ), hash_( q2 ) );
 
     boost::weak_ptr<int> q3( p3 );
 
-    BOOST_TEST_NE( hash( p1 ), hash( q3 ) );
-    BOOST_TEST_NE( hash( q1 ), hash( q3 ) );
+    BOOST_TEST_NE( hash_( p1 ), hash_( q3 ) );
+    BOOST_TEST_NE( hash_( q1 ), hash_( q3 ) );
 
     boost::weak_ptr<int> q4;
 
-    BOOST_TEST_EQ( hash( p4 ), hash( q4 ) );
-    BOOST_TEST_NE( hash( q1 ), hash( q4 ) );
+    BOOST_TEST_EQ( hash_( p4 ), hash_( q4 ) );
+    BOOST_TEST_NE( hash_( q1 ), hash_( q4 ) );
 
     boost::weak_ptr<void> q5;
 
-    BOOST_TEST_EQ( hash( q4 ), hash( q5 ) );
+    BOOST_TEST_EQ( hash_( q4 ), hash_( q5 ) );
 
     boost::weak_ptr<void> q7( p7 );
 
-    BOOST_TEST_EQ( hash( p1 ), hash( q7 ) );
-    BOOST_TEST_EQ( hash( q1 ), hash( q7 ) );
+    BOOST_TEST_EQ( hash_( p1 ), hash_( q7 ) );
+    BOOST_TEST_EQ( hash_( q1 ), hash_( q7 ) );
 
     p1.reset();
     p2.reset();
@@ -79,10 +79,10 @@ int main()
     BOOST_TEST( q3.expired() );
     BOOST_TEST( q7.expired() );
 
-    BOOST_TEST_EQ( hash( q1 ), hash( q2 ) );
-    BOOST_TEST_EQ( hash( q1 ), hash( q7 ) );
-    BOOST_TEST_NE( hash( q1 ), hash( q3 ) );
-    BOOST_TEST_NE( hash( q1 ), hash( q4 ) );
+    BOOST_TEST_EQ( hash_( q1 ), hash_( q2 ) );
+    BOOST_TEST_EQ( hash_( q1 ), hash_( q7 ) );
+    BOOST_TEST_NE( hash_( q1 ), hash_( q3 ) );
+    BOOST_TEST_NE( hash_( q1 ), hash_( q4 ) );
 
     return boost::report_errors();
 }