tcp_address_t and ipc_address_t merged into a single class

This patch is a preliminary work for mergine TCP and IPC connecters
and listeners. The ultimated goal is to avoid code duplication
occuring in these classes.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

2 files changed, 8 insertions, 16 deletions

diff --git a/builds/msvc/libxs/libxs.vcxproj b/builds/msvc/libxs/libxs.vcxproj
index 229d7ec..4effff4 100644
--- a/builds/msvc/libxs/libxs.vcxproj
+++ b/builds/msvc/libxs/libxs.vcxproj
@@ -103,6 +103,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\address.cpp" />
     <ClCompile Include="..\..\..\src\clock.cpp" />
     <ClCompile Include="..\..\..\src\core.cpp" />
     <ClCompile Include="..\..\..\src\ctx.cpp" />
@@ -116,7 +117,6 @@
     <ClCompile Include="..\..\..\src\io_object.cpp" />
     <ClCompile Include="..\..\..\src\io_thread.cpp" />
     <ClCompile Include="..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_address.cpp" />
     <ClCompile Include="..\..\..\src\ipc_connecter.cpp" />
     <ClCompile Include="..\..\..\src\ipc_listener.cpp" />
     <ClCompile Include="..\..\..\src\kqueue.cpp" />
@@ -151,7 +151,6 @@
     <ClCompile Include="..\..\..\src\stream_engine.cpp" />
     <ClCompile Include="..\..\..\src\sub.cpp" />
     <ClCompile Include="..\..\..\src\surveyor.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_address.cpp" />
     <ClCompile Include="..\..\..\src\tcp_connecter.cpp" />
     <ClCompile Include="..\..\..\src\tcp_listener.cpp" />
     <ClCompile Include="..\..\..\src\thread.cpp" />
@@ -168,6 +167,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\include\xs.h" />
     <ClInclude Include="..\..\..\include\zmq.h" />
+    <ClInclude Include="..\..\..\src\address.hpp" />
     <ClInclude Include="..\..\..\src\array.hpp" />
     <ClInclude Include="..\..\..\src\atomic_counter.hpp" />
     <ClInclude Include="..\..\..\src\atomic_ptr.hpp" />
@@ -188,7 +188,6 @@
     <ClInclude Include="..\..\..\src\i_engine.hpp" />
     <ClInclude Include="..\..\..\src\io_object.hpp" />
     <ClInclude Include="..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\src\ipc_address.hpp" />
     <ClInclude Include="..\..\..\src\ipc_connecter.hpp" />
     <ClInclude Include="..\..\..\src\ipc_listener.hpp" />
     <ClInclude Include="..\..\..\src\kqueue.hpp" />
@@ -225,7 +224,6 @@
     <ClInclude Include="..\..\..\src\stream_engine.hpp" />
     <ClInclude Include="..\..\..\src\sub.hpp" />
     <ClInclude Include="..\..\..\src\surveyor.hpp" />
-    <ClInclude Include="..\..\..\src\tcp_address.hpp" />
     <ClInclude Include="..\..\..\src\tcp_connecter.hpp" />
     <ClInclude Include="..\..\..\src\tcp_listener.hpp" />
     <ClInclude Include="..\..\..\src\thread.hpp" />
diff --git a/builds/msvc/libxs/libxs.vcxproj.filters b/builds/msvc/libxs/libxs.vcxproj.filters
index a1b80e3..85831bf 100644
--- a/builds/msvc/libxs/libxs.vcxproj.filters
+++ b/builds/msvc/libxs/libxs.vcxproj.filters
@@ -11,6 +11,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\address.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\clock.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -44,9 +47,6 @@
     <ClCompile Include="..\..\..\src\ip.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ipc_address.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\ipc_connecter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -134,9 +134,6 @@
     <ClCompile Include="..\..\..\src\sub.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\tcp_address.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\tcp_connecter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -193,6 +190,9 @@
     <ClInclude Include="..\..\..\include\xs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\address.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\array.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -247,9 +247,6 @@
     <ClInclude Include="..\..\..\src\ip.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ipc_address.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\ipc_connecter.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -349,9 +346,6 @@
     <ClInclude Include="..\..\..\src\sub.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\tcp_address.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\tcp_connecter.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>