Added SENF_NO_DEBUG symbol and removed dependency on NDEBUG

[senf.git] / Socket / SocketHandle.cci

diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci
index 25ddfc1..c25d09f 100644 (file)
--- 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_