allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

NO-OP: name-change (_list and _lock are also used in other places)

Browse Source 
Derived classes need to explicitly specify namespace and class
to avoid ambiguities (even for private members)
This commit is contained in:
Robin Gareus
2017-07-30 02:27:52 +02:00
parent fe5f00c367
commit ea48c56061
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/pbd/pbd/signals.h
View File

@@ -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<ScopedConnection*> ConnectionList;
ConnectionList _list;
ConnectionList _scoped_connection_list;
};
#include "pbd/signals_generated.h"

10
libs/pbd/signals.cc
View File

@@ -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 ();
}