X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINetAddressing.hh;h=e1095fdd381bc320923a6c68f6516dea44f444c3;hb=1ad3873b372da6187b1fbc645bf276287d2efb54;hp=40f0a7ae819170ef9f64581e2384a7a983bf49a9;hpb=821f1bf89a0e3ef83469c56e4a9a21c39b956cb4;p=senf.git

diff --git a/Socket/Protocols/INet/INetAddressing.hh b/Socket/Protocols/INet/INetAddressing.hh
index 40f0a7a..e1095fd 100644
--- a/Socket/Protocols/INet/INetAddressing.hh
+++ b/Socket/Protocols/INet/INetAddressing.hh
@@ -32,10 +32,11 @@
 #include <exception>
 #include <netinet/in.h>
 #include <boost/operators.hpp>
-#include "Socket/SocketPolicy.hh"
-#include "Socket/ClientSocketHandle.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/Protocols/GenericAddressingPolicy.hh"
+#include "../../../Socket/SocketPolicy.hh"
+#include "../../../Socket/ClientSocketHandle.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/Protocols/GenericAddressingPolicy.hh"
+#include "../../../Utils/safe_bool.hh"
 #include "INet4Address.hh"
 #include "INet6Address.hh"
 
@@ -56,7 +57,7 @@ namespace senf {
      */
     class INet4SocketAddress
         : public boost::equality_comparable<INet4SocketAddress>, 
-          public senf::ComparableSafeBool<INet4SocketAddress>
+          public senf::comparable_safe_bool<INet4SocketAddress>
     {
     public:
         INet4SocketAddress();
@@ -82,7 +83,7 @@ namespace senf {
         INet4Address address() const;   ///< Return address
         unsigned port() const;          ///< Return port number
 
-        bool boolean_test() const;      ///< \c true, if address is empty (i.e. 0.0.0.0:0)
+        bool boolean_test() const;      ///< \c true, if address is not empty (i.e. 0.0.0.0:0)
 
         void clear();                   ///< Clear address/port to 0.0.0.0:0
 
@@ -100,7 +101,7 @@ namespace senf {
 
         struct SyntaxException : public std::exception
         { virtual char const * what() const throw() 
-                { return "Invalid IpV4 socket address syntax"; } };
+                { return "Invalid IPv4 socket address syntax"; } };
 
     private:
         struct ::sockaddr_in addr_;
@@ -163,7 +164,7 @@ namespace senf {
                                                  address cannot be resolved.
                                              \param[in] addr Address to parse
                                              \param[in] resolve If this is
-                                                 INet6Address::ResolveINet4, support IpV4
+                                                 INet6Address::ResolveINet4, support IPv4
                                                  addresses. See INet6Address. */
         INet6SocketAddress(INet6Address const & addr, unsigned port);
                                         ///< Initialize from address and port
@@ -199,7 +200,7 @@ namespace senf {
 
         struct SyntaxException : public std::exception
         { virtual char const * what() const throw() 
-                { return "Invalid IpV6 socket address syntax"; } };
+                { return "Invalid IPv6 socket address syntax"; } };
 
     protected: