X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketHandle.hh;h=36cac8c4badc008341cb01bdd9e3a64bbd3bb575;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=867d0aad421708dbbdadd42adf0e007d4a2a95a1;hpb=d5ba3d7759212c90a5f4a25baf0dc38e290c3b64;p=senf.git

diff --git a/Socket/SocketHandle.hh b/Socket/SocketHandle.hh
index 867d0aa..36cac8c 100644
--- a/Socket/SocketHandle.hh
+++ b/Socket/SocketHandle.hh
@@ -24,18 +24,18 @@
     \brief SocketHandle public header
  */
 
-#ifndef HH_SocketHandle_
-#define HH_SocketHandle_ 1
+#ifndef HH_SENF_Socket_SocketHandle_
+#define HH_SENF_Socket_SocketHandle_ 1
+
+//#include "SocketHandle.mpp"
+#include "SocketHandle.ih"
 
 // Custom includes
 #include <memory> // std::auto_ptr
 #include "FileHandle.hh"
 #include "SocketPolicy.hh"
 
-//#include "SocketHandle.mpp"
-#include "SocketHandle.ih"
 ///////////////////////////////hh.p////////////////////////////////////////
-#include "SocketHandle.ih"
 
 namespace senf {
 
@@ -148,7 +148,7 @@ namespace senf {
                                                  documentation. */
 
         template <class Facet>
-        Facet const & facet();          ///< Access a protocol facet
+        Facet & facet();                ///< Access a protocol facet
                                         /**< This member will try to access the given protocol facet
                                              of the socket. If \a Facet is a valid facet of the
                                              protocol, it is returned, otherwise \c std::bad_cast
@@ -190,7 +190,7 @@ namespace senf {
                                         /**< This member replaces the corresponding FileHandle
                                              member and returns an appropriately cast body
                                              reference */
-        SocketProtocol const & protocol() const;
+        SocketProtocol & protocol() const;
                                         ///< Access protocol class
 
         void assign(FileHandle other);  /**< \internal */