From 55bc0eec91534540a35289470cdf8a43fbc60f60 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 19 Dec 2018 16:19:38 -0500 Subject: [PATCH] adjustments for latest boost shared_ptr debug patch --- libs/pbd/boost_debug.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/pbd/boost_debug.cc b/libs/pbd/boost_debug.cc index e1c6571f9c..a0b09dcbc4 100644 --- a/libs/pbd/boost_debug.cc +++ b/libs/pbd/boost_debug.cc @@ -115,8 +115,8 @@ std::ostream& operator<< (std::ostream& str, const SPDebug& spd) return str; } -typedef std::multimap PointerMap; -typedef std::map IPointerMap; +typedef std::multimap PointerMap; +typedef std::map IPointerMap; using namespace std; @@ -146,7 +146,7 @@ static Glib::Threads::Mutex& the_lock() { static bool -is_interesting_object (void const* ptr) +is_interesting_object (volatile void const* ptr) { if (ptr == 0) { return false; @@ -273,7 +273,7 @@ boost_debug_shared_ptr_reset (void const *sp, void const *old_obj, int old_use_c } void -boost_debug_shared_ptr_destructor (void const *sp, void const *obj, int use_count) +boost_debug_shared_ptr_destructor (void const *sp, volatile void const *obj, int use_count) { Glib::Threads::Mutex::Lock guard (the_lock()); PointerMap::iterator x = sptrs().find (sp); @@ -287,7 +287,7 @@ boost_debug_shared_ptr_destructor (void const *sp, void const *obj, int use_coun } void -boost_debug_shared_ptr_constructor (void const *sp, void const *obj, int use_count) +boost_debug_shared_ptr_constructor (void const *sp, volatile void const *obj, int use_count) { if (is_interesting_object (obj)) { Glib::Threads::Mutex::Lock guard (the_lock());