From f3ca8e65a826a965840645a7a45836ac338858c6 Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 11 Apr 2019 18:20:59 -0400 Subject: [PATCH] Fix issue when using boost mutexes --- parallel_hashmap/phmap_base.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/parallel_hashmap/phmap_base.h b/parallel_hashmap/phmap_base.h index 94d780b..490fdb9 100644 --- a/parallel_hashmap/phmap_base.h +++ b/parallel_hashmap/phmap_base.h @@ -4719,18 +4719,20 @@ public: #ifdef PHMAP_HAS_BOOST_THREAD_MUTEXES +#if 1 // --------------------------------------------------------------------------- template <> class LockableImpl : public boost::shared_mutex { public: using mutex_type = boost::shared_mutex; + using Base = LockableBaseImpl; using SharedLock = boost::shared_lock; using UpgradeLock = boost::unique_lock; // we assume that boost::shared_mutex can't upgrade using UniqueLock = boost::unique_lock; using UpgradeToUnique = typename Base::DoNothing; // we already have unique ownership }; - +#else // --------------------------------------------------------------------------- template <> class LockableImpl : public boost::upgrade_mutex @@ -4742,6 +4744,7 @@ public: using UniqueLock = boost::unique_lock; using UpgradeToUnique = boost::upgrade_to_unique_lock; }; +#endif #endif