diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-24 22:30:09 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-24 22:30:09 +0100 |
| commit | bbb4c1c61863b9032af2291bff20814733995391 (patch) | |
| tree | 3ea88d5d789e2046c88680bf6decc088f29719fd /src/utils | |
| parent | 096b2cd614c521db3dd5b26508ce983e50acc531 (diff) | |
| parent | a5690fa2a4cce2698225f1f558183f6fe306d860 (diff) | |
| download | mana-bbb4c1c61863b9032af2291bff20814733995391.tar.gz mana-bbb4c1c61863b9032af2291bff20814733995391.tar.bz2 mana-bbb4c1c61863b9032af2291bff20814733995391.tar.xz mana-bbb4c1c61863b9032af2291bff20814733995391.zip | |
Merge branch '0.6'
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/mutex.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 26ad754e..f7f26233 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -53,7 +53,9 @@ class MutexLocker { public: MutexLocker(Mutex *mutex); +#ifdef ENABLE_CPP0X MutexLocker(MutexLocker&&); +#endif ~MutexLocker(); private: @@ -93,11 +95,14 @@ inline MutexLocker::MutexLocker(Mutex *mutex): mMutex->lock(); } +#ifdef ENABLE_CPP0X inline MutexLocker::MutexLocker(MutexLocker&& rhs): mMutex(rhs.mMutex) { rhs.mMutex = NULL; } +#endif + inline MutexLocker::~MutexLocker() { if (mMutex) |