tizen 2.4 release

[framework/web/wrt-commons.git] / modules / i18n / dao / include / wrt-commons / i18n-dao-ro / i18n_database.h

diff --git a/modules_mobile/i18n/dao/include/wrt-commons/i18n-dao-ro/i18n_database.h b/modules/i18n/dao/include/wrt-commons/i18n-dao-ro/i18n_database.h
similarity index 91%
rename from modules_mobile/i18n/dao/include/wrt-commons/i18n-dao-ro/i18n_database.h
rename to modules/i18n/dao/include/wrt-commons/i18n-dao-ro/i18n_database.h
index 3492f63..2f4d9d4 100644 (file)
--- a/modules_mobile/i18n/dao/include/wrt-commons/i18n-dao-ro/i18n_database.h
+++ b/modules/i18n/dao/include/wrt-commons/i18n-dao-ro/i18n_database.h
@@ -18,8 +18,8 @@
 #define _I18N_DATABASE_H_
 
 #include <dpl/thread.h>
-#include <dpl/mutex.h>
 #include <dpl/db/thread_database_support.h>
+#include <mutex>
 
 namespace I18n {
 namespace DB {
@@ -27,7 +27,7 @@ namespace Interface {
 void attachDatabaseRO();
 void detachDatabase();
 
-extern DPL::Mutex g_dbQueriesMutex;
+extern std::mutex g_dbQueriesMutex;
 extern DPL::DB::ThreadDatabaseSupport g_dbInterface;
 } // namespace Interface
 } // namespace DB
@@ -36,8 +36,8 @@ extern DPL::DB::ThreadDatabaseSupport g_dbInterface;
 #define I18N_DB_INTERNAL(tlsCommand, InternalType)                             \
     static DPL::ThreadLocalVariable<InternalType> *tlsCommand##Ptr = NULL;     \
     {                                                                          \
-        DPL::Mutex::ScopedLock lock(                                           \
-            &I18n::DB::Interface::g_dbQueriesMutex);                           \
+        std::lock_guard<std::mutex> lock(                                      \
+            I18n::DB::Interface::g_dbQueriesMutex);                            \
         if (!tlsCommand##Ptr) {                                                \
             static DPL::ThreadLocalVariable<InternalType> tmp;                 \
             tlsCommand##Ptr = &tmp;                                            \