Merge remote branch 'origin/master' into release/unstable

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

diff --git a/lily/include/scale.hh b/lily/include/scale.hh
index daaf0bb2dc6ca4c213ad96a32349872f5ef126a9..d3d132810b2d45976f68da318fd469c759c7c8c9 100644 (file)
--- a/lily/include/scale.hh
+++ b/lily/include/scale.hh
@@ -24,9 +24,9 @@
 #include "rational.hh"
 #include "std-vector.hh"
 
-struct Scale
+struct Scale : public Smob<Scale>
 {
-public:
+  virtual ~Scale ();
   Scale (vector<Rational> const &);
   Scale (Scale const &);
 
@@ -35,7 +35,6 @@ public:
   int step_count () const;
   int normalize_step (int step) const;
 
-  DECLARE_SMOBS (Scale);
 
 private:
   vector<Rational> step_tones_;
@@ -44,4 +43,3 @@ private:
 extern Scale *default_global_scale;
 
 #endif /* SCALE_HH */
-