rename unix namespace into unix_impl and windows namespace into windo…

…ws_impl Cylix#27
zhouyuan · Nov 23, 2016 · 23fdf5d · 23fdf5d
1 parent a628e28
commit 23fdf5d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,9 +58,9 @@ link_directories(${GTEST_LIBS})
 set(SRC_DIRS "sources" "sources/network" "sources/builders")
 
 IF (WIN32)
-  set(SRC_DIRS ${SRC_DIRS} "sources/network/windows")
+  set(SRC_DIRS ${SRC_DIRS} "sources/network/windows_impl")
 ELSE ()
-  set(SRC_DIRS ${SRC_DIRS} "sources/network/unix")
+  set(SRC_DIRS ${SRC_DIRS} "sources/network/unix_impl")
 ENDIF (WIN32)
 
 foreach(dir ${SRC_DIRS})

diff --git a/...des/cpp_redis/network/unix/io_service.hpp → ...pp_redis/network/unix_impl/io_service.hpp b/...des/cpp_redis/network/unix/io_service.hpp → ...pp_redis/network/unix_impl/io_service.hpp
@@ -21,7 +21,7 @@ namespace cpp_redis {
 
 namespace network {
 
-namespace unix {
+namespace unix_impl {
 
 class io_service : public network::io_service {
 public:
@@ -96,7 +96,7 @@ class io_service : public network::io_service {
   std::recursive_mutex m_fds_mutex;
 };
 
-} //! unix
+} //! unix_impl
 
 } //! network
 

diff --git a/.../cpp_redis/network/windows/io_service.hpp → ...redis/network/windows_impl/io_service.hpp b/.../cpp_redis/network/windows/io_service.hpp → ...redis/network/windows_impl/io_service.hpp
@@ -14,7 +14,7 @@ namespace cpp_redis {
 
 namespace network {
 
-namespace windows {
+namespace windows_impl {
 
 typedef enum _enIoOperation {
   //IO_OP_ACCEPT,
@@ -131,7 +131,7 @@ class io_service : public network::io_service {
   std::recursive_mutex m_socket_mutex;
 };
 
-} //! windows
+} //! windows_impl
 
 } //! network
 

diff --git a/sources/network/io_service.cpp b/sources/network/io_service.cpp
@@ -1,9 +1,9 @@
 #include <cpp_redis/network/io_service.hpp>
 
 #ifdef _WIN32
-#include <cpp_redis/network/windows/io_service.hpp>
+#include <cpp_redis/network/windows_impl/io_service.hpp>
 #else
-#include <cpp_redis/network/unix/io_service.hpp>
+#include <cpp_redis/network/unix_impl/io_service.hpp>
 #endif /* _WIN32 */
 
 namespace cpp_redis {
@@ -36,9 +36,9 @@ io_service::get_nb_workers(void) const {
 std::shared_ptr<network::io_service>
 create_io_service(std::size_t nb_workers) {
 #ifdef _WIN32
-  return std::make_shared<windows::io_service>(nb_workers);
+  return std::make_shared<windows_impl::io_service>(nb_workers);
 #else
-  return std::make_shared<unix::io_service>(nb_workers);
+  return std::make_shared<unix_impl::io_service>(nb_workers);
 #endif /* _WIN32 */
 }
 

diff --git a/sources/network/unix/io_service.cpp → sources/network/unix_impl/io_service.cpp b/sources/network/unix/io_service.cpp → sources/network/unix_impl/io_service.cpp
@@ -1,14 +1,14 @@
 #include <fcntl.h>
 
 #include <cpp_redis/logger.hpp>
-#include <cpp_redis/network/unix/io_service.hpp>
+#include <cpp_redis/network/unix_impl/io_service.hpp>
 #include <cpp_redis/redis_error.hpp>
 
 namespace cpp_redis {
 
 namespace network {
 
-namespace unix {
+namespace unix_impl {
 
 io_service::io_service(std::size_t nb_workers)
 : network::io_service(nb_workers)
@@ -287,7 +287,7 @@ io_service::notify_poll(void) {
   (void) write(m_notif_pipe_fds[1], "a", 1);
 }
 
-} //! unix
+} //! unix_impl
 
 } //! network
 

diff --git a/sources/network/windows/io_service.cpp → sources/network/windows_impl/io_service.cpp b/sources/network/windows/io_service.cpp → sources/network/windows_impl/io_service.cpp
@@ -1,11 +1,11 @@
-#include <cpp_redis/network/windows/io_service.hpp>
+#include <cpp_redis/network/windows_impl/io_service.hpp>
 #include <cpp_redis/redis_error.hpp>
 
 namespace cpp_redis {
 
 namespace network {
 
-namespace windows {
+namespace windows_impl {
 
 io_service::io_service(std::size_t nb_workers)
 : network::io_service(nb_workers)
@@ -245,7 +245,7 @@ io_service::process_io(void) {
   }   //while
 }
 
-} //! windows
+} //! windows_impl
 
 } //! network