Include `freetype.hh' where appropriate.

[lilypond.git] / flower / include / std-vector.hh

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 1d0cbbac3a2ad08a8d230482c09fc4ebffdd916b..e7f29a8fcbb05065e0157f7c60c586b4e2309823 100644 (file)
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2006--2012 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
@@ -89,6 +89,10 @@ public:
   {
   }
 
+  vector<T, A> (size_t n) : __flower_vector<T, A> (n)
+  {
+  }
+
   vector<T, A> (vector<T, A> const &v) : __flower_vector<T, A> (v)
   {
   }
@@ -190,7 +194,7 @@ template<typename T, typename Compare>
 vsize
 binary_search (vector<T> const &v,
                T const &key,
-               Compare less = less<T> (),
+               Compare less,
                vsize b = 0, vsize e = VPOS)
 {
   vsize lb = lower_bound (v, key, less, b, e);
@@ -254,7 +258,7 @@ junk_pointers (vector<T> &v)
 }
 
 vector<string> string_split (string str, char c);
-string string_join (vector<string> const &strs, string infix);
+string string_join (vector<string> const &strs, const string &infix);
 
 #define iterof(i,s) typeof((s).begin()) i((s).begin())