X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketHandle.cci;h=c25d09f304672a861f1feab403d74931355fbc33;hb=51044eb18f034c1a059ffe2fb109a422c1cbe251;hp=8adbd5fa0bf69a7d65a7bac5f5120bd7b2bbc469;hpb=85ab07d100a382467a42e19d741d403a7a96c951;p=senf.git

diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci
index 8adbd5f..c25d09f 100644
--- a/Socket/SocketHandle.cci
+++ b/Socket/SocketHandle.cci
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,7 +27,8 @@
 #include "SocketHandle.ih"
 
 // Custom includes
-#include "Utils/Exception.hh"
+#include "../Utils/senfassert.hh"
+#include "../Utils/Exception.hh"
 #include "SocketProtocol.hh"
 
 #define prefix_ inline
@@ -37,7 +38,7 @@ prefix_ senf::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protocol,
                                             bool isServer)
     : protocol_(protocol), isServer_(isServer)
 {
-    BOOST_ASSERT( ! protocol_->body_ );
+    SENF_ASSERT( ! protocol_->body_ );
     protocol_->body_ = this;
 }
 
@@ -45,7 +46,7 @@ prefix_ senf::SocketBody::SocketBody(std::auto_ptr<SocketProtocol> protocol,
                                             bool isServer, int fd)
     : FileBody(fd), protocol_(protocol), isServer_(isServer)
 {
-    BOOST_ASSERT( ! protocol_->body_ );
+    SENF_ASSERT( ! protocol_->body_ );
     protocol_->body_ = this;
 }
 
@@ -61,14 +62,12 @@ prefix_ bool senf::SocketBody::isServer()
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::detail::ConvertibleString
+// senf::detail::StreamableString
 
-prefix_ senf::detail::ConvertibleString::ConvertibleString()
-{}
-
-prefix_ senf::detail::ConvertibleString::ConvertibleString(bool v)
-    : std::string(v ? "true" : "false")
-{}
+prefix_ senf::detail::StreamableString & senf::detail::StreamableString::operator<<(bool v)
+{
+    return (*this) << std::string(v ? "true" : "false");
+}
 
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_
@@ -80,4 +79,6 @@ prefix_ senf::detail::ConvertibleString::ConvertibleString(bool v)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: