Add namespace sensor for Autolock

Change-Id: Ie5df4a9471cb2dfac519ce37cb195206fe7f5761
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index fa43b1a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.project
-.cproject
-.*.swp
-nbproject
-.vscode
\ No newline at end of file

diff --git a/src/shared/cbase_lock.cpp b/src/shared/cbase_lock.cpp
index a7d758696cd8c49bd7ff3a0d8416525c6fffa9f7..6c394973b955a1251c20413257a67b38cffd8e43 100644 (file)
--- a/src/shared/cbase_lock.cpp
+++ b/src/shared/cbase_lock.cpp
@@ -24,6 +24,8 @@
 #include <cbase_lock.h>
 #include <sensor_log.h>
 
+using namespace sensor;
+
 cbase_lock::cbase_lock()
 {
        m_history_mutex = PTHREAD_MUTEX_INITIALIZER;

diff --git a/src/shared/cbase_lock.h b/src/shared/cbase_lock.h
index 2de5c7e2aaca910fc368cef47e664a8ab7da71ff..5c76040b0e02cce373aac905fb109c50a3ae8ff6 100644 (file)
--- a/src/shared/cbase_lock.h
+++ b/src/shared/cbase_lock.h
@@ -22,6 +22,8 @@
 
 #include <pthread.h>
 
+namespace sensor {
+
 enum lock_type {
        LOCK_TYPE_MUTEX,
        LOCK_TYPE_READ,
@@ -83,5 +85,6 @@ public:
        Autolock(cbase_lock &m, lock_type type);
        ~Autolock();
 };
+}
 
 #endif /* _CBASE_LOCK_H_ */

diff --git a/src/shared/channel.cpp b/src/shared/channel.cpp
index 22b0eaaa56bf989e028ebd0a72ae2abb0824ed5f..10ed266bb060d61d2f951141d53f974363fa2e6b 100644 (file)
--- a/src/shared/channel.cpp
+++ b/src/shared/channel.cpp
@@ -30,6 +30,7 @@
 #define SYSTEMD_SOCK_BUF_SIZE (128*1024)
 
 using namespace ipc;
+using namespace sensor;
 
 class send_event_handler : public event_handler
 {

diff --git a/src/shared/channel.h b/src/shared/channel.h
index bc8444f3d15edc7d8c95253b700fc67e61a89d2f..5af06da6ed745f17647153e0285a8afbc7eb8c4c 100644 (file)
--- a/src/shared/channel.h
+++ b/src/shared/channel.h
@@ -74,7 +74,7 @@ private:
        std::vector<uint64_t> m_pending_event_id;
 
        std::atomic<bool> m_connected;
-       cmutex m_cmutex;
+       sensor::cmutex m_cmutex;
 };
 
 }

diff --git a/src/shared/cmutex.cpp b/src/shared/cmutex.cpp
index 6245b6e76d23a35b17e06f6d1d4569fb75338452..958835cb3ae2d91aac30e2d73849c69dad0591af 100644 (file)
--- a/src/shared/cmutex.cpp
+++ b/src/shared/cmutex.cpp
@@ -20,6 +20,8 @@
 #include <cmutex.h>
 #include <sensor_log.h>
 
+using namespace sensor;
+
 cmutex::cmutex()
 {
        pthread_mutexattr_t mutex_attr;

diff --git a/src/shared/cmutex.h b/src/shared/cmutex.h
index 94aa2b683a678fc6457014c75a371a926e772523..343a260e332a5ea237b70dcc267169728d7ce48d 100644 (file)
--- a/src/shared/cmutex.h
+++ b/src/shared/cmutex.h
@@ -21,6 +21,7 @@
 #define _CMUTEX_H_
 
 #include "cbase_lock.h"
+namespace sensor {
 
 class cmutex : public cbase_lock {
 public:
@@ -39,4 +40,5 @@ private:
        pthread_mutex_t m_mutex;
 };
 
+}
 #endif /* _CMUTEX_H_ */

diff --git a/src/shared/event_loop.cpp b/src/shared/event_loop.cpp
index a49a2e44449addfbecbb87fea583e69c9a885008..e0e979948140f92e9488bb2695cb6c80a5d11874 100644 (file)
--- a/src/shared/event_loop.cpp
+++ b/src/shared/event_loop.cpp
@@ -33,6 +33,7 @@
 #define BAD_HANDLE 0
 
 using namespace ipc;
+using namespace sensor;
 
 static gboolean g_io_handler(GIOChannel *ch, GIOCondition condition, gpointer data)
 {

diff --git a/src/shared/event_loop.h b/src/shared/event_loop.h
index 405f628cdc22e1d81c515c924486a080cfa95ba7..40fcb2ece9e032194decaff8ff0e55cedf86e7bb 100644 (file)
--- a/src/shared/event_loop.h
+++ b/src/shared/event_loop.h
@@ -98,7 +98,7 @@ private:
        std::map<uint64_t, handler_info *> m_handlers;
 
        int m_term_fd;
-       cmutex m_cmutex;
+       sensor::cmutex m_cmutex;
 };
 
 }