Run grand replace for 2015.

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index f90d641a6040fc3c047d67c9609dfb65860a19b3..773e4ecad83c4e9d7053af8cebe1f129122b6c0d 100644 (file)
--- 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
@@ -30,7 +30,8 @@
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
   int i = 0;
   while ((d != 1))
     {
@@ -78,7 +79,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;
 
@@ -113,4 +114,4 @@ get_point_in_y_direction (Offset orig, Real slope, Real dist, Direction dir)
   complex<Real> res = orig_c + to_move;
 
   return Offset (real (res), imag (res));
-}
\ No newline at end of file
+}