From 72d0fc5e83257d956dff8e4aa5f07281bc664b4e Mon Sep 17 00:00:00 2001
From: Xiangyin Ma <x1.ma@samsung.com>
Date: Thu, 22 Oct 2015 13:52:51 +0100
Subject: [PATCH] Update with the moving of mutex, conditional wait under a
 threading folder

Change-Id: If13685509d69fc6a3139e2b073f05a02bb0dca14
---
 .../base/performance-logging/networking/network-performance-server.h    | 2 +-
 adaptors/base/performance-logging/performance-server.h                  | 2 +-
 adaptors/base/performance-logging/statistics/stat-context-manager.h     | 2 +-
 adaptors/base/thread-synchronization.h                                  | 2 +-
 adaptors/x11/pixmap-render-surface-x.cpp                                | 2 +-
 platform-abstractions/tizen/resource-loader/resource-loader.cpp         | 2 +-
 platform-abstractions/tizen/resource-loader/resource-thread-base.h      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adaptors/base/performance-logging/networking/network-performance-server.h b/adaptors/base/performance-logging/networking/network-performance-server.h
index 6cff347..d323c1a 100644
--- a/adaptors/base/performance-logging/networking/network-performance-server.h
+++ b/adaptors/base/performance-logging/networking/network-performance-server.h
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <pthread.h>
-#include <dali/devel-api/common/mutex.h>
+#include <dali/devel-api/threading/mutex.h>
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
diff --git a/adaptors/base/performance-logging/performance-server.h b/adaptors/base/performance-logging/performance-server.h
index 8c71900..6ee2a29 100644
--- a/adaptors/base/performance-logging/performance-server.h
+++ b/adaptors/base/performance-logging/performance-server.h
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLDUES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/devel-api/common/mutex.h>
+#include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL INCLUDES
 #include <base/performance-logging/frame-time-stats.h>
diff --git a/adaptors/base/performance-logging/statistics/stat-context-manager.h b/adaptors/base/performance-logging/statistics/stat-context-manager.h
index 1252eee..35308d2 100644
--- a/adaptors/base/performance-logging/statistics/stat-context-manager.h
+++ b/adaptors/base/performance-logging/statistics/stat-context-manager.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/common/mutex.h>
+#include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL INCLUDES
 #include <base/performance-logging/performance-marker.h>
diff --git a/adaptors/base/thread-synchronization.h b/adaptors/base/thread-synchronization.h
index dbd00ed..b1106e9 100644
--- a/adaptors/base/thread-synchronization.h
+++ b/adaptors/base/thread-synchronization.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/common/conditional-wait.h>
+#include <dali/devel-api/threading/conditional-wait.h>
 
 // INTERNAL INCLUDES
 #include <integration-api/thread-synchronization-interface.h>
diff --git a/adaptors/x11/pixmap-render-surface-x.cpp b/adaptors/x11/pixmap-render-surface-x.cpp
index 6cfd46c..f945a8c 100644
--- a/adaptors/x11/pixmap-render-surface-x.cpp
+++ b/adaptors/x11/pixmap-render-surface-x.cpp
@@ -28,7 +28,7 @@
 
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/debug.h>
-#include <dali/devel-api/common/mutex.h>
+#include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL INCLUDES
 
diff --git a/platform-abstractions/tizen/resource-loader/resource-loader.cpp b/platform-abstractions/tizen/resource-loader/resource-loader.cpp
index 2caa5ef..a0e3fcf 100755
--- a/platform-abstractions/tizen/resource-loader/resource-loader.cpp
+++ b/platform-abstractions/tizen/resource-loader/resource-loader.cpp
@@ -24,7 +24,7 @@
 #include <queue>
 #include <cstring>
 #include <dali/devel-api/common/map-wrapper.h>
-#include <dali/devel-api/common/mutex.h>
+#include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL HEADERS
 #include <dali/integration-api/bitmap.h>
diff --git a/platform-abstractions/tizen/resource-loader/resource-thread-base.h b/platform-abstractions/tizen/resource-loader/resource-thread-base.h
index 5f85ecf..280785d 100644
--- a/platform-abstractions/tizen/resource-loader/resource-thread-base.h
+++ b/platform-abstractions/tizen/resource-loader/resource-thread-base.h
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <deque>
-#include <dali/devel-api/common/conditional-wait.h>
+#include <dali/devel-api/threading/conditional-wait.h>
 
 // INTERNAL INCLUDES
 #include "resource-loader.h"
-- 
2.7.4