X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=b930fd521a50e4eb2c93d69736591cac7a7b402e;hb=23838d1d1ae8a457ad59adc81bf2f9fcbb531b44;hp=801266d79b07ff6a8114c572b00f29f51a186259;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 801266d79b..b930fd521a 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--2012 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,6 +19,7 @@
 */
 
 #include "misc.hh"
+#include "offset.hh"
 #include "warn.hh"
 
 /*
@@ -27,7 +28,8 @@
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
   int i = 0;
   while ((d != 1))
     {
@@ -75,7 +77,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;