X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstd-string.cc;h=593a286d84e291313a3266c4f0d874549268bc56;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=d2c2d624d2981893ce9ac21879d450015f2364d9;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/flower/std-string.cc b/flower/std-string.cc
index d2c2d624d2..593a286d84 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--2012  Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2006--2015  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
@@ -19,9 +19,10 @@
 
 #include "std-string.hh"
 #include "string-convert.hh"
+#include "std-vector.hh"
 
 string
-to_string (string s)
+to_string (const string &s)
 {
   return s;
 }
@@ -106,7 +107,7 @@ replace_all (string *str, char find, char replace)
 }
 
 char *
-string_copy (string s)
+string_copy (const string &s)
 {
   ssize len = s.length ();
   char *dest = new char[len + 1];
@@ -116,14 +117,6 @@ string_copy (string s)
   return dest;
 }
 
-int
-string_compare (string const &a, string const &b)
-{
-  return a.compare (b);
-}
-
-#include "std-vector.hh"
-
 vector<string>
 string_split (string str, char c)
 {
@@ -144,7 +137,7 @@ string_split (string str, char c)
 }
 
 string
-string_join (vector<string> const &strs, string infix)
+string_join (vector<string> const &strs, const string &infix)
 {
   string result;
   for (vsize i = 0; i < strs.size (); i++)