Issue 4630/2: Add override_input to music created from loc_on_music

[lilypond.git] / lily / simple-spacer-scheme.cc

diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc
index fe14925be8fc7d0c9c0d3104f4717fac53212b38..61a2d5dee4b8df15835b161afcf1129a60fd47f2 100644 (file)
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@
 #include "warn.hh"
 #include "simple-spacer.hh"
 
+using std::vector;
+
 LY_DEFINE (ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
            4, 1, 0, (SCM springs, SCM rods, SCM length, SCM ragged),
            "Solve a spring and rod problem for @var{count} objects, that"
@@ -48,7 +50,7 @@ LY_DEFINE (ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
   SCM_ASSERT_TYPE (scm_ilength (rods) > 0, rods, SCM_ARG1, __FUNCTION__, "list of rods");
   LY_ASSERT_TYPE (scm_is_number, length, 3);
 
-  bool is_ragged = ragged == SCM_BOOL_T;
+  bool is_ragged = to_boolean (ragged);
   Simple_spacer spacer;
   for (SCM s = springs; scm_is_pair (s); s = scm_cdr (s))
     {