From: Leandro Lucarella <llucarella@integratech.com.ar>
Date: Mon, 29 Sep 2008 18:01:03 +0000 (-0300)
Subject: Move basic_socket.hpp to the socket directory
X-Git-Url: https://git.llucax.com/software/posixx.git/commitdiff_plain/0d50a176b9084ac3badd649fd1c122cb48bcdc62?hp=73a9db44cca62733dc2e8cb8037ed67843843e66

Move basic_socket.hpp to the socket directory

Since everything defined by basic_socket.hpp is in the posixx::socket
namespace, it's more natural to place it in the socket directory.
---

diff --git a/src/linux/tipc.hpp b/src/linux/tipc.hpp
index aa450b8..873cfbb 100644
--- a/src/linux/tipc.hpp
+++ b/src/linux/tipc.hpp
@@ -1,7 +1,7 @@
 #ifndef POSIXX_LINUX_TIPC_HPP_
 #define POSIXX_LINUX_TIPC_HPP_
 
-#include "../basic_socket.hpp" // posixx::socket
+#include "../socket/basic_socket.hpp" // posixx::socket
 
 #include <linux/tipc.h> // all tipc stuff
 #include <cstring> // memcpy
diff --git a/src/basic_socket.hpp b/src/socket/basic_socket.hpp
similarity index 99%
rename from src/basic_socket.hpp
rename to src/socket/basic_socket.hpp
index 125d94b..3f6f779 100644
--- a/src/basic_socket.hpp
+++ b/src/socket/basic_socket.hpp
@@ -1,8 +1,8 @@
-#ifndef POSIXX_BASIC_SOCKET_HPP_
-#define POSIXX_BASIC_SOCKET_HPP_
+#ifndef POSIXX_SOCKET_BASIC_SOCKET_HPP_
+#define POSIXX_SOCKET_BASIC_SOCKET_HPP_
 
-#include "error.hpp" // posixx::error
-#include "static_assert.hpp" // static_assert
+#include "../error.hpp" // posixx::error
+#include "../static_assert.hpp" // static_assert
 
 #include <string> // std::string
 #include <utility> // std::pair
@@ -863,4 +863,4 @@ void recv(std::string& buf, size_t n)
 }
 #endif
 
-#endif // _POSIXX_BASIC_SOCKET_HPP_
+#endif // _POSIXX_SOCKET_BASIC_SOCKET_HPP_
diff --git a/src/socket/inet.hpp b/src/socket/inet.hpp
index 05d6ddf..1ad2ce4 100644
--- a/src/socket/inet.hpp
+++ b/src/socket/inet.hpp
@@ -1,7 +1,7 @@
 #ifndef POSIXX_SOCKET_INET_HPP_
 #define POSIXX_SOCKET_INET_HPP_
 
-#include "../basic_socket.hpp" // posixx::socket
+#include "basic_socket.hpp" // posixx::socket
 
 #include <netinet/in.h> // sockaddr_in, htonl, htons, {PF,AF}_INET, INADDR_ANY
 #include <arpa/inet.h> // inet_addr
diff --git a/src/socket/unix.hpp b/src/socket/unix.hpp
index 0b2cfb3..6da9dde 100644
--- a/src/socket/unix.hpp
+++ b/src/socket/unix.hpp
@@ -1,7 +1,7 @@
 #ifndef POSIXX_SOCKET_UNIX_HPP_
 #define POSIXX_SOCKET_UNIX_HPP_
 
-#include "../basic_socket.hpp" // posixx::socket
+#include "basic_socket.hpp" // posixx::socket
 
 #include <sys/un.h> // sockaddr_un
 #include <string> // std::string
diff --git a/test/socket/generic_test_includes.hpp b/test/socket/generic_test_includes.hpp
index 7819baa..e943ef0 100644
--- a/test/socket/generic_test_includes.hpp
+++ b/test/socket/generic_test_includes.hpp
@@ -7,6 +7,6 @@
 #include <fcntl.h>
 #include <cstring>
 #include <string>
-#include <posixx/basic_socket.hpp>
+#include <posixx/socket/basic_socket.hpp>
 #include <posixx/socket/opt.hpp>