X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketHandle.cc;h=8b39e32f322d0dadf60945ffc85c462d43a30e68;hb=9a988902090d28007578e93bffd809f6bd913155;hp=f2225a8e3794e1d956c392d5e7ab6aeef61a7d89;hpb=70256cc93f59f5d2c9b3428775a181e5e225bfc5;p=senf.git

diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc
index f2225a8..8b39e32 100644
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2006 
+// Copyright (C) 2006
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
 //     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief senf::SocketHandle non-inline non-template implementation
+    \brief SocketHandle non-inline non-template implementation
  */
 
 #include "SocketHandle.hh"
@@ -78,7 +78,7 @@ prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
 // senf::detail::StateMapOrdering
 
 namespace {
-    bool contains(std::string::iterator b, std::string::iterator e, char c)
+    bool contains(std::string::const_iterator b, std::string::const_iterator e, char c)
     {
         for (; b != e; ++b)
             if (*b == c)
@@ -91,10 +91,10 @@ prefix_ bool senf::detail::StateMapOrdering::operator()(std::string const & a1,
                                                         std::string const & a2)
     const
 {
-    std::string::iterator i1 (a1.begin());
-    std::string::iterator const i1_end (a1.end());
-    std::string::iterator i2 (a2.begin());
-    std::string::iterator const i2_end (a2.end());
+    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)
@@ -102,14 +102,14 @@ prefix_ bool senf::detail::StateMapOrdering::operator()(std::string const & a1,
             return false;
         if (contains(i2,i2_end,'.'))
             // the longer string is a sub-'directory' of the shorter
-	    /** \fixme shouldn't this be *i2 == '.' ? */
+            /** \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 == '.' ? */
+            /** \fixme shouldn't this be *i1 == '.' ? */
             return false;
         return *i1 < *i2;
     }
@@ -147,5 +147,8 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<Policy>
 
 // Local Variables:
 // mode: c++
+// fill-column: 100
 // c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
 // End: