* The grand 2005-2006 replace.

[lilypond.git] / flower / string.cc

diff --git a/flower/string.cc b/flower/string.cc
index 8f34cf44adc5e7cb51a14e8c4a59b3df0c7d0361..4d7fd9019bc096bafb9030334b934743293c158d 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -1,7 +1,7 @@
 /*
   string.cc - implement String
 
-  (c) 1997--2005 Han-Wen Nienhuys & Jan Nieuwenhuizen
+  (c) 1997--2006 Han-Wen Nienhuys & Jan Nieuwenhuizen
 */
 
 #ifndef _GNU_SOURCE // we want memmem
@@ -16,6 +16,7 @@
 #include <cstring>
 
 #include <iostream>
+using namespace std;
 
 #include "libc-extension.hh"
 #include "string-convert.hh"
@@ -131,8 +132,6 @@ String::to_bytes () const
   return strh_.to_bytes ();
 }
 
-
-
 Byte *
 String::get_bytes ()
 {
@@ -234,8 +233,9 @@ String::index (String searchfor) const
 {
   char const *me = strh_.to_str0 ();
 
-  char const *p = (char const *)
-    memmem (me, length (), searchfor.to_str0 (), searchfor.length ());
+  char const *p
+    = (char const *) memmem (me, length (),
+                            searchfor.to_str0 (), searchfor.length ());
 
   if (p)
     return p - me;
@@ -262,9 +262,7 @@ String::index_any (String set) const
     {
       char *found = (char *) memchr (me, set[i], n);
       if (found)
-       {
-         return found - (char const *)me;
-       }
+       return found - (char const *)me;
     }
   return -1;
 }