Issue 4625/4: Move in-chord slur info to slur boundaries

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index f66a81ba62adacb8518709f030ab658b942870f6..d1659a06227382b9d356861652d5ce766d3968d8 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,8 +30,7 @@
 class Score : public Smob<Score>
 {
 public:
-  static int print_smob (SCM, SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Score ();
 private:
@@ -41,7 +40,7 @@ private:
 public:
   Input *origin () const;
 
-  vector<Output_def *> defs_;
+  std::vector<Output_def *> defs_;
   bool error_found_;
 
   Score ();