X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision-engraver.cc;h=6406d1318fe4af3751594ed23d104c78b69901b6;hb=dd9cdec4d7fb538b3a201f3b82a10b5ac9ef5f79;hp=20e7eb9fc784940fe610bec1d6348d5382616250;hpb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;p=lilypond.git

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 20e7eb9fc7..6406d1318f 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -32,6 +32,10 @@
 #include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
+using std::set;
+
 class Rest_collision_engraver : public Engraver
 {
 protected:
@@ -62,7 +66,7 @@ Rest_collision_engraver::process_acknowledged ()
       if (!g || !m)
         continue;
 
-      if (Rhythmic_head::has_interface (g) && (*m) > now)
+      if (has_interface<Rhythmic_head> (g) && (*m) > now)
         {
           Grob *column = g->get_parent (X_AXIS);
           if (!column)
@@ -70,7 +74,7 @@ Rest_collision_engraver::process_acknowledged ()
 
           // Only include rests that start now. Include notes that started any time.
           Paper_column *paper_column = dynamic_cast<Item *> (column)->get_column ();
-          if (!Rest::has_interface (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
+          if (!has_interface<Rest> (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
             {
               columns.insert (column);
               rest_count += Note_column::has_rests (column);
@@ -92,8 +96,6 @@ Rest_collision_engraver::stop_translation_timestep ()
   rest_collision_ = 0;
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Rest_collision_engraver,
                 /* doc */
                 "Handle collisions of rests.",