From ea48c56061aa7324b076ab01ee408005a46bae8e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 30 Jul 2017 02:27:52 +0200 Subject: NO-OP: name-change (_list and _lock are also used in other places) Derived classes need to explicitly specify namespace and class to avoid ambiguities (even for private members) --- libs/pbd/pbd/signals.h | 4 ++-- libs/pbd/signals.cc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/pbd/pbd/signals.h b/libs/pbd/pbd/signals.h index df4c9cef29..9640008591 100644 --- a/libs/pbd/pbd/signals.h +++ b/libs/pbd/pbd/signals.h @@ -191,10 +191,10 @@ class LIBPBD_API ScopedConnectionList : public boost::noncopyable one from another. */ - Glib::Threads::Mutex _lock; + Glib::Threads::Mutex _scoped_connection_lock; typedef std::list ConnectionList; - ConnectionList _list; + ConnectionList _scoped_connection_list; }; #include "pbd/signals_generated.h" diff --git a/libs/pbd/signals.cc b/libs/pbd/signals.cc index e01351a867..54bd1f6797 100644 --- a/libs/pbd/signals.cc +++ b/libs/pbd/signals.cc @@ -34,19 +34,19 @@ ScopedConnectionList::~ScopedConnectionList() void ScopedConnectionList::add_connection (const UnscopedConnection& c) { - Glib::Threads::Mutex::Lock lm (_lock); - _list.push_back (new ScopedConnection (c)); + Glib::Threads::Mutex::Lock lm (_scoped_connection_lock); + _scoped_connection_list.push_back (new ScopedConnection (c)); } void ScopedConnectionList::drop_connections () { - Glib::Threads::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_scoped_connection_lock); - for (ConnectionList::iterator i = _list.begin(); i != _list.end(); ++i) { + for (ConnectionList::iterator i = _scoped_connection_list.begin(); i != _scoped_connection_list.end(); ++i) { delete *i; } - _list.clear (); + _scoped_connection_list.clear (); } -- cgit v1.2.3