tizen 2.4 release

[framework/web/wrt-commons.git] / modules / certificate_dao / include / wrt-commons / certificate-dao / certificate_database.h

diff --git a/modules_mobile/certificate_dao/include/wrt-commons/certificate-dao/certificate_database.h b/modules/certificate_dao/include/wrt-commons/certificate-dao/certificate_database.h
similarity index 86%
rename from modules_mobile/certificate_dao/include/wrt-commons/certificate-dao/certificate_database.h
rename to modules/certificate_dao/include/wrt-commons/certificate-dao/certificate_database.h
index f0ee954..1265660 100755 (executable)
--- a/modules_mobile/certificate_dao/include/wrt-commons/certificate-dao/certificate_database.h
+++ b/modules/certificate_dao/include/wrt-commons/certificate-dao/certificate_database.h
@@ -18,20 +18,20 @@
 #define _CERTIFICATE_DATABASE_H_
 
 #include <dpl/thread.h>
-#include <dpl/mutex.h>
-
-extern DPL::Mutex g_certificateDBQueriesMutex;
-
-#define CERTIFICATE_DB_INTERNAL(tlsCommand, InternalType, interface)            \
-    static DPL::ThreadLocalVariable<InternalType> *tlsCommand##Ptr = NULL; \
-    {                                                                        \
-        DPL::Mutex::ScopedLock lock(&g_certificateDBQueriesMutex);              \
-        if (!tlsCommand##Ptr) {                                            \
-            static DPL::ThreadLocalVariable<InternalType> tmp;               \
-            tlsCommand##Ptr = &tmp;                                        \
-        }                                                                    \
-    }                                                                        \
-    DPL::ThreadLocalVariable<InternalType> &tlsCommand = *tlsCommand##Ptr; \
+#include <mutex>
+
+extern std::mutex g_certificateDBQueriesMutex;
+
+#define CERTIFICATE_DB_INTERNAL(tlsCommand, InternalType, interface)          \
+    static DPL::ThreadLocalVariable<InternalType> *tlsCommand##Ptr = NULL;    \
+    {                                                                         \
+        std::lock_guard<std::mutex> lock(g_certificateDBQueriesMutex);        \
+        if (!tlsCommand##Ptr) {                                               \
+            static DPL::ThreadLocalVariable<InternalType> tmp;                \
+            tlsCommand##Ptr = &tmp;                                           \
+        }                                                                     \
+    }                                                                         \
+    DPL::ThreadLocalVariable<InternalType> &tlsCommand = *tlsCommand##Ptr;    \
     if (tlsCommand.IsNull()) { tlsCommand = InternalType(interface); }
 
 #define CERTIFICATE_DB_SELECT(name, type, interface) \