X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstd-string.cc;h=d2c2d624d2981893ce9ac21879d450015f2364d9;hb=bd3c92cbe6edabb9a006ff76290012aa8f8ed13a;hp=18ee4a832e4cad28bbfb0f562aec4a6bc165a667;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/flower/std-string.cc b/flower/std-string.cc index 18ee4a832e..d2c2d624d2 100644 --- a/flower/std-string.cc +++ b/flower/std-string.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2011 Jan Nieuwenhuizen + Copyright (C) 2006--2012 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ to_string (long b) string to_string (long unsigned b) { - return String_convert::unsigned_string (b); + return String_convert::unsigned_long_string (b); } string @@ -93,7 +93,7 @@ replace_all (string *str, string const &find, string const &replace) ssize len = find.length (); ssize replen = replace.length (); for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + replen)) - *str = str->replace (i, len, replace); + * str = str->replace (i, len, replace); return *str; } @@ -112,7 +112,7 @@ string_copy (string s) char *dest = new char[len + 1]; copy (s.begin (), s.end (), dest); dest[len] = 0; - + return dest; } @@ -134,7 +134,7 @@ string_split (string str, char c) { string s = str.substr (0, i); a.push_back (s); - i ++; + i++; str = str.substr (i); i = str.find (c); } @@ -147,10 +147,10 @@ string string_join (vector const &strs, string infix) { string result; - for (vsize i = 0; i < strs.size (); i ++) + for (vsize i = 0; i < strs.size (); i++) { if (i) - result += infix; + result += infix; result += strs[i]; }