X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FServerSocketHandle.hh;h=235b5903e3484c414d82d21d2a006ebfb0c052b1;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=837b454390852c2f91a9e6ec1c8ce6722ff30a8b;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Socket/ServerSocketHandle.hh b/Socket/ServerSocketHandle.hh
index 837b454..235b590 100644
--- a/Socket/ServerSocketHandle.hh
+++ b/Socket/ServerSocketHandle.hh
@@ -24,8 +24,8 @@
     \brief ServerSocketHandle public header
  */
 
-#ifndef HH_ServerSocketHandle_
-#define HH_ServerSocketHandle_ 1
+#ifndef HH_SENF_Socket_ServerSocketHandle_
+#define HH_SENF_Socket_ServerSocketHandle_ 1
 
 // Custom includes
 #include <boost/static_assert.hpp>
@@ -90,7 +90,7 @@ namespace senf {
          */
         typedef typename boost::call_traits<Address>::param_type AddressParam;
         /// Corresponding client socket handle with the same policy
-        typedef ClientSocketHandle<SPolicy> ClientSocketHandle;
+        typedef ClientSocketHandle<SPolicy> ClientHandle;
 
         ///////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
@@ -171,17 +171,15 @@ namespace senf {
 
             \returns handle of new client connection
          */
-        ClientSocketHandle
-                     accept       ();
-        std::pair<ClientSocketHandle, Address>
+        ClientHandle accept       ();
+        std::pair<ClientHandle, Address>
                      acceptfrom   ();   ///< Accept new connection
                                         /**< This variant will additionally return the remote
                                            address of the client
                                            \returns \c std::pair with client handle and client
                                            address.
                                            \see \ref accept() */
-        ClientSocketHandle
-                     acceptfrom   (Address & addr);
+        ClientHandle acceptfrom   (Address & addr);
                                         ///< Accept new connection
                                         /**< This variant will additionally return the remote
                                            address of the client