X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspring.hh;h=fd01ca048cf7bc0ce53506c8b058dae13b244702;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=fe02fe898cd30e0d7e00ef75ce2f3b698cb5dead;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index fe02fe898c..fd01ca048c 100644
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--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
@@ -23,8 +23,12 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 
-class Spring
+class Spring : public Simple_smob<Spring>
 {
+public:
+  static SCM equal_p (SCM, SCM);
+  static const char type_p_name_[];
+private:
   Real distance_;
   Real min_distance_;
 
@@ -35,7 +39,6 @@ class Spring
 
   void update_blocking_force ();
 
-  DECLARE_SIMPLE_SMOBS (Spring);
 public:
   Spring ();
   Spring (Real distance, Real min_distance);
@@ -61,9 +64,7 @@ public:
   void operator *= (Real);
   bool operator > (Spring const &) const;
 };
-DECLARE_UNSMOB (Spring, spring);
 
 Spring merge_springs (vector<Spring> const &springs);
 
 #endif /* SPRING_HH */
-