X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketHandle.cc;fp=Socket%2FSocketHandle.cc;h=74803af0ef534f7b10c39547d0c98cf90f09bbab;hb=c13146edc1b57cc60f102bcfd1a7a602ecec261f;hp=8b39e32f322d0dadf60945ffc85c462d43a30e68;hpb=2fbc9248049ba635a72b95267665cd0a85b1a9e6;p=senf.git diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc index 8b39e32..74803af 100644 --- a/Socket/SocketHandle.cc +++ b/Socket/SocketHandle.cc @@ -87,42 +87,6 @@ namespace { } } -prefix_ bool senf::detail::StateMapOrdering::operator()(std::string const & a1, - std::string const & a2) - const -{ - std::string::const_iterator i1 (a1.begin()); - std::string::const_iterator const i1_end (a1.end()); - std::string::const_iterator i2 (a2.begin()); - std::string::const_iterator const i2_end (a2.end()); - for(; i1 != i1_end && i2 != i2_end && *i1 == *i2; ++i1, ++i2) ; - if (i1 == i1_end) { - if (i2 == i2_end) - // the strings are equal - return false; - if (contains(i2,i2_end,'.')) - // the longer string is a sub-'directory' of the shorter - /** \fixme shouldn't this be *i2 == '.' ? */ - return true; - return *i1 < *i2; - } - else if (i2 == i2_end) { // && i1 != i1_end - if (contains(i1,i1_end,'.')) - // the longer string is a sub-'directory' of the shorter - /** \fixme shouldn't this be *i1 == '.' ? */ - return false; - return *i1 < *i2; - } - if (contains(i1,i1_end,'.')) { - if (contains(i2,i2_end,'.')) - return *i1 < *i2; - return false; - } - else if (contains(i2,i2_end,'.')) - return true; - return *i1 < *i2; -} - prefix_ std::string senf::detail::dumpState(SocketStateMap const & map) { std::stringstream s;