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

[lilypond.git] / lily / include / tuplet-bracket.hh

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 48e7e4718059d5b43a49e0e7d926c5241f74da72..c34a78c0a4f42c668039543adb269eb7bb12e710 100644 (file)
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,14 +34,13 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_connect_to_neighbors, (SCM smob));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
 
-  DECLARE_GROB_INTERFACE ();
   static Grob *get_common_x (Spanner *);
   static void add_tuplet_bracket (Grob *me, Grob *smaller_bracket);
   static void get_bounds (Grob *, Grob **, Grob **);
   static void add_column (Grob *me, Item *);
   static void add_script (Grob *me, Item *);
   static void add_beam (Grob *me, Grob *);
-  static Grob *parallel_beam (Grob *me, vector<Grob *> const &cols,
+  static Grob *parallel_beam (Grob *me, std::vector<Grob *> const &cols,
                               bool *equally_long);
   static void calc_position_and_height (Grob *, Real *, Real *dy);
   static Stencil make_bracket (Grob *me, Axis protrusion_axis,