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 aa450b814ca2856f5a5872f4f8f65f168f156e30..873cfbb0b7111696a3679a03cd0bd4bafe8032b7 100644 (file)
--- 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 125d94b518fd8de1591da4dd395811994e5036a6..3f6f779b4d1965d816f61adee39c5eb14b9d484c 100644 (file)
--- 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 05d6ddfe9825f587d78fae323cd393c2f8a03ebd..1ad2ce49a7d6cdb1a6cc8cb59edb612ba6a376d1 100644 (file)
--- 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 0b2cfb36bf3421dbd9634bfda569e8ca970ed4dd..6da9dde8055f52cec82a1511d6c70268a22d8435 100644 (file)
--- 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 7819baa24963a11734fe117e3d4d72495a39f8be..e943ef099a301100f83718f26e15293541343f69 100644 (file)
--- 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>