Fix namespace conflicts with KLAY

Change-Id: I5e3f147a443846f3d27b64ae6958d398e38e7223
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/libs/array.h b/libs/array.h
index 77ac2a3..5701646 100644 (file)
--- a/libs/array.h
+++ b/libs/array.h
@@ -14,13 +14,13 @@
  *  limitations under the License
  */
 
-#ifndef __RUNTIME_ARRAY_H__
-#define __RUNTIME_ARRAY_H__
+#ifndef __DPC_ARRAY_H__
+#define __DPC_ARRAY_H__
 
 #include <vector>
 #include <utility>
 
-namespace runtime {
+namespace dpc {
 
 template <typename T>
 class Array final {
@@ -54,6 +54,6 @@ private:
        typename std::vector<T>::iterator it;
 };
 
-} // namespace runtime
+} // namespace dpc
 
-#endif // __RUNTIME_ARRAY_H__
+#endif // __DPC_ARRAY_H__

diff --git a/libs/password.cpp b/libs/password.cpp
index 131113e..cde1c27 100644 (file)
--- a/libs/password.cpp
+++ b/libs/password.cpp
@@ -477,7 +477,7 @@ EXPORT_API int dpm_password_get_maximum_numeric_sequence_length(device_policy_ma
        return DPM_ERROR_NONE;
 }
 
-typedef runtime::Array<std::string> dpm_password_iterator;
+typedef dpc::Array<std::string> dpm_password_iterator;
 
 EXPORT_API dpm_password_iterator_h dpm_password_create_iterator(device_policy_manager_h handle)
 {