Issue 4086/5: Introduce callable Smob infrastructure

[lilypond.git] / lily / include / grob-array.hh

diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index 958c59d55e0707d486ec5731dda7cb433861a09b..feeda8a36a23c43831ee11a1f7f3d39e39568bb9 100644 (file)
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -24,12 +24,16 @@
 #include "smobs.hh"
 #include "std-vector.hh"
 
-class Grob_array
+class Grob_array : public Simple_smob<Grob_array>
 {
+public:
+  static int print_smob (SCM, SCM, scm_print_state *);
+  static SCM mark_smob (SCM);
+  static const char type_p_name_[];
+private:
   vector<Grob *> grobs_;
   bool ordered_;
 
-  DECLARE_SIMPLE_SMOBS (Grob_array);
 
   Grob_array ();
 public:
@@ -49,11 +53,9 @@ public:
   static SCM make_array ();
 };
 
-DECLARE_UNSMOB (Grob_array, grob_array);
 
 vector<Grob *> const &ly_scm2link_array (SCM x);
 SCM grob_list_to_grob_array (SCM lst);
 SCM grob_array_to_list (Grob_array *array);
 
 #endif /* GROB_ARRAY_HH */
-