jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of git://gitorious.org/dbus-cplusplus/mainline

Browse source
This commit is contained in:
Andreas Volz 2009-12-01 23:32:21 +01:00
commit 5ae444ff22
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/dbus-c++/eventloop.h
View file

@ -126,7 +126,7 @@ class DXXAPI DefaultMutex
{
public:
DefaultMutex();
DefaultMutex(bool recursive = false);
~DefaultMutex();

10
src/eventloop.cpp
View file

@ -75,10 +75,18 @@ DefaultWatch::~DefaultWatch()
_disp->_mutex_w.unlock();
}
DefaultMutex::DefaultMutex()
DefaultMutex::DefaultMutex(bool recursive)
{
if (recursive)
{
pthread_mutex_t recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
_mutex = recmutex;
}
else
{
pthread_mutex_init(&_mutex, NULL);
}
}
DefaultMutex::~DefaultMutex()
{