PPI: Checkin of first compiling (yet not working) version

[senf.git] / Socket / SocketHandle.ih

diff --git a/Socket/SocketHandle.ih b/Socket/SocketHandle.ih
index 1ca7cdd..5e9fae4 100644 (file)
--- a/Socket/SocketHandle.ih
+++ b/Socket/SocketHandle.ih
@@ -80,22 +80,9 @@ namespace senf {
                                            non-empty). */
         };
 
-        /** \brief Special ordering for the SocketStateMap
-            \internal
-
-            This special ordering will sort 'hierarchical' strings correctly. A hierarchical string
-            in this context is a string like a path- or hostname with '.' as the hierarchical
-            separator.
-         */
-        struct StateMapOrdering
-            : public std::binary_function<std::string,std::string,bool>
-        {
-            bool operator()(std::string const & a1, std::string const & a2) const;
-        };
-
     }
 
-    typedef std::map< std::string, detail::ConvertibleString, detail::StateMapOrdering > SocketStateMap;
+    typedef std::map< std::string, detail::ConvertibleString > SocketStateMap;
 
     namespace detail {
         /** \brief Helper to convert SocketStateMap to multiline string representation
@@ -114,9 +101,13 @@ namespace senf {
         properly. If this invariant is violated, your Program will probably crash.
      */
     class SocketBody
-        : public FileBody
+        : public FileBody, 
+          public senf::pool_alloc_mixin<SocketBody>
     {
     public:
+        using senf::pool_alloc_mixin<SocketBody>::operator new;
+        using senf::pool_alloc_mixin<SocketBody>::operator delete;
+
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
@@ -187,4 +178,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: