Merge branch 'issue4032'

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

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 56763572862d542981ccac6901f708ee19098794..1f6aa3b70cd8e22e54c086da79b772e9f19e3be3 100644 (file)
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 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
@@ -45,7 +45,7 @@ public:
   Real inverse_stretch_strength () const {return inverse_stretch_strength_;}
   Real inverse_compress_strength () const {return inverse_compress_strength_;}
   Real blocking_force () const {return blocking_force_;}
-  
+
   Real length (Real f) const;
 
   void set_distance (Real);
@@ -58,10 +58,9 @@ public:
   void set_default_compress_strength ();
   void set_default_stretch_strength ();
 
-  void operator*= (Real);
-  bool operator> (Spring const&) const;
+  void operator *= (Real);
+  bool operator > (Spring const &) const;
 };
-DECLARE_UNSMOB (Spring, spring);
 
 Spring merge_springs (vector<Spring> const &springs);