repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[deb_libcec.git]
/
src
/
lib
/
platform
/
threads
/
mutex.h
diff --git
a/src/lib/platform/threads/mutex.h
b/src/lib/platform/threads/mutex.h
index ed60ba8724612fae369e1fd7e9e33ede7877e97e..2bd908e533ee00d2298c6c1083afdd6bcd44f3b5 100644
(file)
--- a/
src/lib/platform/threads/mutex.h
+++ b/
src/lib/platform/threads/mutex.h
@@
-2,7
+2,7
@@
/*
* This file is part of the libCEC(R) library.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-201
2
Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-201
3
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@
-31,15
+31,15
@@
* http://www.pulse-eight.net/
*/
* http://www.pulse-eight.net/
*/
-#include "
..
/os.h"
+#include "
lib/platform
/os.h"
#if defined(__WINDOWS__)
#if defined(__WINDOWS__)
-#include "
..
/windows/os-threads.h"
+#include "
lib/platform
/windows/os-threads.h"
#else
#else
-#include "
..
/posix/os-threads.h"
+#include "
lib/platform
/posix/os-threads.h"
#endif
#endif
-#include "
..
/util/timeutils.h"
+#include "
lib/platform
/util/timeutils.h"
namespace PLATFORM
{
namespace PLATFORM
{
@@
-51,7
+51,7
@@
namespace PLATFORM
private:
inline PreventCopy(const PreventCopy &c) { *this = c; }
private:
inline PreventCopy(const PreventCopy &c) { *this = c; }
- inline PreventCopy &operator=(const PreventCopy &
c){ *this = c;
return *this; }
+ inline PreventCopy &operator=(const PreventCopy &
UNUSED(c)){
return *this; }
};
template <typename _Predicate>
};
template <typename _Predicate>
@@
-86,9
+86,12
@@
namespace PLATFORM
inline bool Lock(void)
{
inline bool Lock(void)
{
- MutexLock(m_mutex);
- ++m_iLockCount;
- return true;
+ if (MutexLock(m_mutex))
+ {
+ ++m_iLockCount;
+ return true;
+ }
+ return false;
}
inline void Unlock(void)
}
inline void Unlock(void)