X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdrum-note-engraver.cc;h=37cf47a2174e4ad25145110ce4e843e12f912b2e;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=591fc9d1b6468445c3fa36d9f5ac8cf31c4cdb5d;hpb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;p=lilypond.git

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 591fc9d1b6..37cf47a217 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -18,7 +18,6 @@
 */
 
 #include <cctype>
-using namespace std;
 
 #include "item.hh"
 #include "duration.hh"
@@ -33,6 +32,8 @@ using namespace std;
 
 #include "translator.icc"
 
+using std::vector;
+
 class Drum_notes_engraver : public Engraver
 {
   vector<Item *> scripts_;
@@ -76,7 +77,7 @@ Drum_notes_engraver::process_music ()
 
       SCM defn = SCM_EOL;
 
-      if (scm_hash_table_p (tab) == SCM_BOOL_T)
+      if (to_boolean (scm_hash_table_p (tab)))
         defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
 
       if (scm_is_pair (defn))
@@ -85,7 +86,7 @@ Drum_notes_engraver::process_music ()
           SCM style = scm_car (defn);
           SCM script = scm_cadr (defn);
 
-          if (scm_integer_p (pos) == SCM_BOOL_T)
+          if (scm_is_integer (pos))
             note->set_property ("staff-position", pos);
           if (scm_is_symbol (style))
             note->set_property ("style", style);