Doc-fr: NR-changing-defaults

[lilypond.git] / lily / include / spring.hh

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 9c6c41827923338f1de94eee4664940bf6a7ad1b..d4ebee23cd05f3680b9bfcfe3bb036061a6af92a 100644 (file)
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -27,7 +27,7 @@ class Spring : public Simple_smob<Spring>
 {
 public:
   static SCM equal_p (SCM, SCM);
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
 private:
   Real distance_;
   Real min_distance_;
@@ -65,6 +65,6 @@ public:
   bool operator > (Spring const &) const;
 };
 
-Spring merge_springs (std::vector<Spring> const &springs);
+Spring merge_springs (vector<Spring> const &springs);
 
 #endif /* SPRING_HH */