* stepmake/stepmake/generic-vars.make (LOOP): Add PLUS to keep -j

[lilypond.git] / lily / include / slur-configuration.hh

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index 5e241d0e5f6bbb3cc51c2e6a10285bd8c2a7cf97..285a8da7df6a9acccd4638caf596e6e3f8611cb8 100644 (file)
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_CONFIGURATION_HH
 #define SLUR_CONFIGURATION_HH
 
 #include "bezier.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "main.hh"
 
 class Slur_configuration
@@ -24,13 +24,13 @@ public:
   int index_;
 
 #if DEBUG_SLUR_SCORING
-  String score_card_;
+  std::string score_card_;
 #endif
 
   Slur_configuration ();
 
   void generate_curve (Slur_score_state const &state, Real r0, Real h_inf,
-                      Array<Offset> const &);
+                      std::vector<Offset> const &);
   void score (Slur_score_state const &);
 protected:
   void score_extra_encompass (Slur_score_state const &);