Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / tie-formatting-problem.hh

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 5d46129fe592778753e15cd497a3179a5e73e19f..c5a71b0314b845c558e1120e5f986e41f19ef156 100644 (file)
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -11,9 +11,7 @@
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.hh"
-#include "std-vector.hh"
 #include "skyline.hh"
-#include "lily-proto.hh"
 #include "tie-configuration.hh"
 #include "tie-details.hh"
 #include "tuple.hh"
@@ -47,7 +45,7 @@ struct Tie_configuration_variation
   Tie_configuration_variation ();
 };
 
-typedef map < Tuple<int, 2>, vector<Skyline_entry> > Chord_outline_map;
+typedef map < Tuple<int, 2>, Skyline> Chord_outline_map;
 typedef map < Tuple<int, 2>, Box> Column_extent_map;
 class Tie_formatting_problem
 {