X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-string.hh;h=3c95b2ef7f06baf69fe567b0cc56aba6087307dc;hb=0d7788bc36b5d98931e9fb5115c38abf9b7d4854;hp=d0fdd9c9782d77accc33f7001a63ebdeea5f7ca5;hpb=3f1e8dc68d267b039b9e231564d0e60c67d14429;p=lilypond.git

diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index d0fdd9c978..3c95b2ef7f 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -1,15 +1,27 @@
 /*
-  std-string.hh -- declare string
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef STD_STRING_HH
 #define STD_STRING_HH
  
 #include "compare.hh"
+#include "flower-proto.hh"
 
 #if 0
 /*
@@ -33,13 +45,14 @@ string to_string (int i, char const *format=0);
 string to_string (double f, char const *format=0);
 string to_string (long);
 string to_string (long unsigned);
+string to_string (I64, char const *format=0);
 string to_string (unsigned);
 string to_string (bool b);
 string to_string (char const *format, ...)
   __attribute__ ((format (printf, 1, 2)));
   
-string &replace_all (string &str, string find, string replace);
-string &replace_all (string &str, char find, char replace);
+string &replace_all (string* str, string const &find, string const &replace);
+string &replace_all (string* str, char find, char replace);
 char *string_copy (string s);
 
 int string_compare (string const &, string const &);