Merged revisions 570-575,577-578 via svnmerge from

[senf.git] / Socket / SocketHandle.cci

diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci
index 42f2a0c..20d3a9d 100644 (file)
--- a/Socket/SocketHandle.cci
+++ b/Socket/SocketHandle.cci
@@ -27,7 +27,7 @@
 #include "SocketHandle.ih"
 
 // Custom includes
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 #include "SocketProtocol.hh"
 
 #define prefix_ inline
@@ -61,14 +61,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_
@@ -81,4 +79,5 @@ prefix_ senf::detail::ConvertibleString::ConvertibleString(bool v)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: