Revert "Issue 4550 (2/2) Avoid "using namespace std;" in included files"

[lilypond.git] / lily / include / note-collision.hh

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 62b29e831894bf244f2b383e02a3ddc813032298..ad2ed5345d3575f775e17bbb0585f764c4ce4594 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -37,11 +37,11 @@
 class Note_collision_interface
 {
 public:
-  static SCM automatic_shift (Grob *, Drul_array<std::vector<Grob *> >);
+  static SCM automatic_shift (Grob *, Drul_array<vector<Grob *> >);
   static SCM forced_shift (Grob *);
 
-  static std::vector<int> note_head_positions (Grob *me);
-  static Drul_array<std::vector<Grob *> > get_clash_groups (Grob *me);
+  static vector<int> note_head_positions (Grob *me);
+  static Drul_array<vector<Grob *> > get_clash_groups (Grob *me);
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob));
   static void add_column (Grob *me, Grob *ncol);
 };