Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / lily / include / misc.hh

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 34b28a118f90394002e01fb492a85c3dbeb94796..4303d3b7b59e9f7ef7054a30143f3db173e73d3f 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -12,7 +12,7 @@
 #include <cstdlib>
 using namespace std;
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
 double log_2 (double x);
@@ -28,8 +28,6 @@ sign (int i)
   else return 0;
 }
 
-Array<std::string> split_string (std::string s, char c);
-
 inline Real
 linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
 {
@@ -39,5 +37,6 @@ linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
 
 Real directed_round (Real f, Direction d);
 
+Real peak_around (Real epsilon,  Real threshold, Real x);
 #endif