projects
/
framework
/
web
/
wrt-commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tizen 2.4 release
[framework/web/wrt-commons.git]
/
modules
/
core
/
include
/
dpl
/
waitable_handle_watch_support.h
diff --git
a/modules_wearable/core/include/dpl/waitable_handle_watch_support.h
b/modules/core/include/dpl/waitable_handle_watch_support.h
similarity index 98%
rename from
modules_wearable/core/include/dpl/waitable_handle_watch_support.h
rename to
modules/core/include/dpl/waitable_handle_watch_support.h
index
ac0987f
..
644799c
100644
(file)
--- a/
modules_wearable/core/include/dpl/waitable_handle_watch_support.h
+++ b/
modules/core/include/dpl/waitable_handle_watch_support.h
@@
-26,9
+26,9
@@
#include <dpl/waitable_event.h>
#include <dpl/waitable_handle.h>
#include <dpl/exception.h>
#include <dpl/waitable_event.h>
#include <dpl/waitable_handle.h>
#include <dpl/exception.h>
-#include <dpl/recursive_mutex.h>
#include <list>
#include <map>
#include <list>
#include <map>
+#include <mutex>
namespace DPL {
class Thread;
namespace DPL {
class Thread;
@@
-98,7
+98,7
@@
class WaitableHandleWatchSupport
WaitableHandleWatchers> WaitableHandleWatchersMap;
// Waitable event watch support
WaitableHandleWatchers> WaitableHandleWatchersMap;
// Waitable event watch support
- mutable
RecursiveM
utex m_watchersMutex;
+ mutable
std::recursive_m
utex m_watchersMutex;
WaitableHandleWatchersMap m_watchersMap;
WaitableEvent m_watchersInvoker;
WaitableEvent m_watchersInvokerCommit;
WaitableHandleWatchersMap m_watchersMap;
WaitableEvent m_watchersInvoker;
WaitableEvent m_watchersInvokerCommit;