synced with master (merged master into gtk3)

This commit is contained in:
Beep6581
2015-10-17 16:23:10 +02:00
98 changed files with 6601 additions and 1473 deletions

View File

@@ -227,7 +227,7 @@ public:
inline MyReaderLock(MyRWMutex& mutex, const char* name, const char* file, const int line) : rwMutex(mutex), locked(false), locknumber(0)
#else
public:
inline MyReaderLock(MyRWMutex& mutex) : rwMutex(mutex)
inline MyReaderLock(MyRWMutex & mutex) : rwMutex(mutex)
#endif
{
@@ -463,7 +463,7 @@ public:
inline MyWriterLock(MyRWMutex& mutex, const char* name, const char* file, const int line) : rwMutex(mutex), locked(false), locknumber(0)
#else
public:
inline MyWriterLock(MyRWMutex& mutex) : rwMutex(mutex)
inline MyWriterLock(MyRWMutex & mutex) : rwMutex(mutex)
#endif
{
// to operate safely