X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=6cafa2b50b3669fac258e5d2b1d3e51cdb737db1;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=cc673e954898d1c7ec7186f451a3d6a344b6a277;hpb=d199c2786d16e1fc00bd17fd9b1a54a8312e2079;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index cc673e9548..6cafa2b50b 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -19,26 +19,9 @@
 */
 
 #include "misc.hh"
+#include "offset.hh"
 #include "warn.hh"
 
-/*
-  Return the 2-log, rounded down
-*/
-int
-intlog2 (int d)
-{
-  assert (d);
-  int i = 0;
-  while ((d != 1))
-    {
-      d /= 2;
-      i++;
-    }
-
-  assert (! (d / 2));
-  return i;
-}
-
 double
 log_2 (double x)
 {
@@ -75,7 +58,7 @@ convex_amplifier (Real standard_x, Real increase_factor, Real x)
 }
 
 string
-camel_case_to_lisp_identifier (string in)
+camel_case_to_lisp_identifier (const string &in)
 {
   vector<char> out;