projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Synfig::Mutex instead of Glib::Mutex.
[synfig.git]
/
ETL
/
trunk
/
ETL
/
_handle.h
diff --git
a/ETL/trunk/ETL/_handle.h
b/ETL/trunk/ETL/_handle.h
index
6a46f85
..
13af09b
100644
(file)
--- a/
ETL/trunk/ETL/_handle.h
+++ b/
ETL/trunk/ETL/_handle.h
@@
-36,7
+36,7
@@
#include <cassert>
#ifdef ETL_LOCK_REFCOUNTS
#include <cassert>
#ifdef ETL_LOCK_REFCOUNTS
-#include <
glibmm/thread
.h>
+#include <
synfig/mutex
.h>
#endif
/* === M A C R O S ========================================================= */
#endif
/* === M A C R O S ========================================================= */
@@
-73,7
+73,7
@@
class shared_object
private:
mutable int refcount;
#ifdef ETL_LOCK_REFCOUNTS
private:
mutable int refcount;
#ifdef ETL_LOCK_REFCOUNTS
- mutable
Glib
::Mutex mutex;
+ mutable
synfig
::Mutex mutex;
#endif
protected:
#endif
protected:
@@
-89,7
+89,7
@@
public:
void ref()const
{
#ifdef ETL_LOCK_REFCOUNTS
void ref()const
{
#ifdef ETL_LOCK_REFCOUNTS
-
Glib
::Mutex::Lock lock(mutex);
+
synfig
::Mutex::Lock lock(mutex);
#endif
assert(refcount>=0); refcount++;
}
#endif
assert(refcount>=0); refcount++;
}
@@
-98,7
+98,7
@@
public:
bool unref()const
{
#ifdef ETL_LOCK_REFCOUNTS
bool unref()const
{
#ifdef ETL_LOCK_REFCOUNTS
-
Glib
::Mutex::Lock lock(mutex);
+
synfig
::Mutex::Lock lock(mutex);
#endif
assert(refcount>0);
#endif
assert(refcount>0);
@@
-108,7
+108,7
@@
public:
#ifdef ETL_SELF_DELETING_SHARED_OBJECT
refcount=-666;
#ifdef ETL_LOCK_REFCOUNTS
#ifdef ETL_SELF_DELETING_SHARED_OBJECT
refcount=-666;
#ifdef ETL_LOCK_REFCOUNTS
-
lock.release
();
+
mutex.unlock
();
#endif
delete this;
#endif
#endif
delete this;
#endif
@@
-121,7
+121,7
@@
public:
int count()const
{
#ifdef ETL_LOCK_REFCOUNTS
int count()const
{
#ifdef ETL_LOCK_REFCOUNTS
-
Glib
::Mutex::Lock lock(mutex);
+
synfig
::Mutex::Lock lock(mutex);
#endif
return refcount;
}
#endif
return refcount;
}