Issue 4459/1: Mark mark_smob () member functions as const

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 0c855fd4d08043b30f8e24bac8be2ce14293551c..ca3703369a98ab091a242765ec2b7c5e0a055208 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -72,7 +72,7 @@ All_font_metrics::~All_font_metrics ()
 }
 
 SCM
-All_font_metrics::mark_smob ()
+All_font_metrics::mark_smob () const
 {
 #if HAVE_PANGO_FT2
   if (pango_dict_)

diff --git a/lily/book.cc b/lily/book.cc
index 8ba2aac9080432144e58aa035a70575871dd7b50..bf324091041b73cc21650863fb18857036cb429b 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -107,7 +107,7 @@ Book::~Book ()
 
 
 SCM
-Book::mark_smob ()
+Book::mark_smob () const
 {
   if (paper_)
     scm_gc_mark (paper_->self_scm ());

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 7e391740a6d2f4327df101a85f6b4df513e2c76f..62895966038f63ec9737f85ff1a9bb392382da00 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -97,7 +97,7 @@ Context_def::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context_def::mark_smob ()
+Context_def::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 

diff --git a/lily/context-mod.cc b/lily/context-mod.cc
index fd2a25d2fe5fc64fec88a7eea3ec34deedc85962..c45e4f4d1a40c69ec1560d0b355f6eaa9cf895dd 100644 (file)
--- a/lily/context-mod.cc
+++ b/lily/context-mod.cc
@@ -46,7 +46,7 @@ Context_mod::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context_mod::mark_smob ()
+Context_mod::mark_smob () const
 {
   return mods_;
 }

diff --git a/lily/context-property.cc b/lily/context-property.cc
index 5904254d7d9e263520f5f025a385bb8137820257..99b16f669b116d3028c738e2532918ae01ae265c 100644 (file)
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -66,7 +66,7 @@ typecheck_grob (SCM symbol, SCM value)
 class Grob_properties : public Simple_smob<Grob_properties>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
 private:
   friend class Grob_property_info;
@@ -97,7 +97,7 @@ private:
 const char Grob_properties::type_p_name_[] = "ly:grob-properties?";
 
 SCM
-Grob_properties::mark_smob ()
+Grob_properties::mark_smob () const
 {
   scm_gc_mark (alist_);
   scm_gc_mark (based_on_);

diff --git a/lily/context.cc b/lily/context.cc
index 51aa8f024edb618ae4274c9d459a54b88c9e35ec..da92c0748c01f03086863dbcf8bbc3d76e422dc7 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -717,7 +717,7 @@ Context::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context::mark_smob ()
+Context::mark_smob () const
 {
   scm_gc_mark (context_list_);
   scm_gc_mark (aliases_);

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index 2b80c3358ef69ad1caf3d9011b10901353d23130..1cb7dfaa87f2e9d3ecf722680094a60974ee2f90 100644 (file)
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -41,7 +41,7 @@ Dispatcher::Dispatcher ()
 }
 
 SCM
-Dispatcher::mark_smob ()
+Dispatcher::mark_smob () const
 {
   scm_gc_mark (dispatchers_);
   scm_gc_mark (listen_classes_);

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index f18b2d7256ae2717928937c3bbe76cc41799d121..674aef76a9d6b0af07330eeb464461f5374e5e35 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -95,7 +95,7 @@ Font_metric::derived_mark () const
 }
 
 SCM
-Font_metric::mark_smob ()
+Font_metric::mark_smob () const
 {
   derived_mark ();
   return description_;

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 27f05076f2c47d25ce0ba0a1a51422ad57a9dfa3..1cabe136ed6a1b191905a617f83cfbe6b8609ebf 100644 (file)
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -52,7 +52,7 @@ Grob_array::array () const
 }
 
 SCM
-Grob_array::mark_smob ()
+Grob_array::mark_smob () const
 {
 #if 0  /* see System::derived_mark () const */
   for (vsize i = 0; i < grobs_.size (); i++)

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index f3383e77fda15e655f99831993d1ae9139b60fee..d038f9b84030bcc75ca906fd7478783a89706b9f 100644 (file)
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -26,7 +26,7 @@
 const char Grob::type_p_name_[] = "ly:grob?";
 
 SCM
-Grob::mark_smob ()
+Grob::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index 88820ea363a6765bff0d34906b5313bd7c2bcd8e..a2d090a6dfd71c7567447e5ff75dd87ece76f756 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -48,7 +48,7 @@ class All_font_metrics : public Smob<All_font_metrics>
 
   All_font_metrics (All_font_metrics const &);
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
 
   Index_to_charcode_map const *get_index_to_charcode_map (const string &filename,
                                                           int face_index,

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 6b1c2bfb14ca48e7a60380fcab1b3b883d9e7601..3ea6c2c550b0346db2e77d88903df91735c6a2b4 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -29,7 +29,7 @@
 class Book : public Smob<Book>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Book ();
   SCM header_;

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 9a7db15b6d68e1c87cb82838edf3cbb82970d926..e8e8d3b68e70440097af9db052d8445184c8efa2 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -33,7 +33,7 @@
 */
 struct Context_def : public Smob<Context_def>
 {
-  SCM mark_smob ();
+  SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
   virtual ~Context_def ();

diff --git a/lily/include/context-mod.hh b/lily/include/context-mod.hh
index a42ec91433a26d1b807a2191d80ec7c59342e359..cef084c87e9049000173b6178e098698b4a2867d 100644 (file)
--- a/lily/include/context-mod.hh
+++ b/lily/include/context-mod.hh
@@ -36,7 +36,7 @@
 */
 struct Context_mod : public Simple_smob<Context_mod>
 {
-  SCM mark_smob ();
+  SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
 private:

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 048bbd6dd45af6a0e66952acda436ae1f27998c2..85e2d1f44ca7a3c93c1e8bff55fb5855d0eea3c5 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -31,7 +31,7 @@
 class Context : public Smob<Context>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
   virtual ~Context ();

diff --git a/lily/include/dispatcher.hh b/lily/include/dispatcher.hh
index f7efad821467b6aaf51d9a0dfc89019a35db265f..a7c96f9201ed3e6633beba056a13fa07fe9bca73 100644 (file)
--- a/lily/include/dispatcher.hh
+++ b/lily/include/dispatcher.hh
@@ -28,7 +28,7 @@ class Dispatcher : public Smob<Dispatcher>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Dispatcher ();
 private:

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index b1016b65c6e923228df4a30078115b0dc2c3fa8f..f1917b0c4af402029b09af25ab00fdfb097eb26e 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -34,7 +34,7 @@ class Font_metric : public Smob<Font_metric>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Font_metric ();
 private:

diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index 87cb19e23d1a23ec71b4317a9911ce3c688f5ea6..e3631c8ea9128e526694bea200210664e3adb62e 100644 (file)
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -28,7 +28,7 @@ class Grob_array : public Simple_smob<Grob_array>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
 private:
   vector<Grob *> grobs_;

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 4748b17273887381146a5be4ee43f6eeb1ff55a9..5dea5a948c80c572101060161a2dc3c8f15e1ed0 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -31,7 +31,7 @@ class Grob : public Smob<Grob>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Grob ();
 private:

diff --git a/lily/include/input.hh b/lily/include/input.hh
index b33b5067308f4b6f568c2dd1dc335c5de608b23a..cde9b87893d9fab05b0a2ad701b0d9c86e0b0f9a 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -35,7 +35,7 @@ public:
   static const char type_p_name_[];
   int print_smob (SCM, scm_print_state *);
   static SCM equal_p (SCM, SCM);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   Source_file *get_source_file () const;
   char const *start () const;
   char const *end () const;

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 5a622c9317b4e888c667fed7897a5b1bd4184f08..7a4bc15de560fe49e77e8947784d97674b06a569 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -35,7 +35,7 @@ class Lily_lexer : public Smob<Lily_lexer>, public Includable_lexer
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Lily_lexer ();
 private:

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index 6d299d48b47fdaecfca19409883ba329dd32d757..cb36382b3b058d231323c9ad1d79ba7b78e2cc29 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -35,7 +35,7 @@ class Lily_parser : public Smob<Lily_parser>
   static SCM do_yyparse_trampoline (void *parser);
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Lily_parser ();
   Lily_lexer *lexer_;

diff --git a/lily/include/listener.hh b/lily/include/listener.hh
index 6f8995c64e88d134406abab2a799c9b527a67e37..00a64eebb892db03b4231cb983e413c9a4051d34 100644 (file)
--- a/lily/include/listener.hh
+++ b/lily/include/listener.hh
@@ -108,7 +108,7 @@ public:
     return SCM_UNSPECIFIED;
   }
 
-  SCM mark_smob ()
+  SCM mark_smob () const
   {
     scm_gc_mark (callback_);
     return target_;

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 2afa31941a1c68cfd030c3f32c170f21306eb3ec..30f27ba894067c889c4cb63b7a10388956d91807 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -62,7 +62,7 @@ class Music_iterator : public Smob<Music_iterator>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Music_iterator ();
 protected:

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 37437fbcac98f6f627f9b156cb15038a1a667448..3d1d25728a4a4a08e329069da647ba95651ed7ff 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -30,7 +30,7 @@ class Music_output : public Smob<Music_output>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Music_output ();
 private:

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index 1364b646669c88a6227c1b2e1239fb7f64d64440..5712639cb087451c544125fc87311ae7b395e0d8 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -50,7 +50,7 @@ class Output_def : public Smob<Output_def>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Output_def ();
   VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def);

diff --git a/lily/include/page-marker.hh b/lily/include/page-marker.hh
index cb823d0f0d18cf496825b6284f21d0e6ab0ba25d..02233d30a6d804d06bfa8d420e6e4187944007df 100644 (file)
--- a/lily/include/page-marker.hh
+++ b/lily/include/page-marker.hh
@@ -26,7 +26,7 @@
 class Page_marker : public Smob<Page_marker>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Page_marker ();
 private:

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 40a40a39b67183201a87ff77318c3e75d4064e8f..b105cdb3de50d5763909b3d38ef900de8468a286 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -30,7 +30,7 @@
 class Paper_book : public Smob<Paper_book>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Paper_book ();
 private:

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 73daf148b4ea19c5736f1423fbe455ebc3e19b80..cd1a5e2c92fb4ffb34a0581f85398750c1276d28 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -33,7 +33,7 @@
 class Paper_outputter : public Smob<Paper_outputter>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   virtual ~Paper_outputter ();
 private:
   SCM output_module_;

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index 90b4317f685e66fb72d4d20dd0c912285c4f4477..3e78b7995263d865b641673a6c9da7eb109474e7 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -37,7 +37,7 @@ class Pitch : public Simple_smob<Pitch>
 public:
   static SCM equal_p (SCM, SCM);
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
 private:
   int octave_;

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 9f6ad9609a080e5c7567944c39607781edcb88a7..1f437ac5ef20cbb79208cb2ab4015b205eacfb1b 100644 (file)
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -35,7 +35,7 @@ class Prob : public Smob<Prob>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static SCM equal_p (SCM, SCM);
   static const char type_p_name_[];
   virtual ~Prob ();

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index d14997676add36b8419b022bec71513e7c539b54..8a1922d3c375bc2140e8f240cf56fcd6816c2be8 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -47,7 +47,7 @@ class Scheme_hash_table : public Smob<Scheme_hash_table>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   virtual ~Scheme_hash_table ();
   bool try_retrieve (SCM key, SCM *val);
   bool contains (SCM key) const;

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 0baf198fa325ce2b9076442642fe1d4338d4afb5..b3ece8960a813245139822c999120a85d668899a 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -30,7 +30,7 @@
 class Score : public Smob<Score>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Score ();
 private:

diff --git a/lily/include/small-smobs.hh b/lily/include/small-smobs.hh
index 41171b4881a5945de45f7e7a7c6e3820e12281ef..07fd4ef341230a0b996b4dd26af402dccbd75b53 100644 (file)
--- a/lily/include/small-smobs.hh
+++ b/lily/include/small-smobs.hh
@@ -32,7 +32,7 @@ public:
   static SCM make_smob (SCM arg1 = SCM_UNDEFINED) {
     SCM_RETURN_NEWSMOB (Smob_base<Super>::smob_tag (), SCM_UNPACK (arg1));
   }
-  SCM mark_smob () { return scm1 (); };
+  SCM mark_smob () const { return scm1 (); };
   static Super *unchecked_unsmob (SCM s) {
     return reinterpret_cast<Super *> (SCM_UNPACK (s));
   }
@@ -52,7 +52,7 @@ public:
                          SCM_UNPACK (arg1),
                          SCM_UNPACK (arg2));
   }
-  SCM mark_smob ()
+  SCM mark_smob () const
   {
     scm_gc_mark (scm2 ());
     return scm1 ();
@@ -80,7 +80,7 @@ public:
                          SCM_UNPACK (arg2),
                          SCM_UNPACK (arg3));
   }
-  SCM mark_smob ()
+  SCM mark_smob () const
   {
     scm_gc_mark (scm3 ());
     scm_gc_mark (scm2 ());

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index 3bcec9931e77ae67da0639ee2234157335bf9f6b..c5edc4b01f63a0cad022360a25006f96e8ba9e99 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -177,7 +177,7 @@ private:
   // Most default functions are do-nothings.  void init() will
   // recognize their address when not overriden and will then refrain
   // altogether from passing the the respective callbacks to GUILE.
-  SCM mark_smob (void);
+  SCM mark_smob (void) const;
   static SCM mark_trampoline (SCM); // Used for calling mark_smob
   static size_t free_smob (SCM obj);
   static SCM equal_p (SCM, SCM);

diff --git a/lily/include/smobs.tcc b/lily/include/smobs.tcc
index f76609bf5b96ac8fca532f4cb975d109c0ac8b2c..c063da2f93db657e5b7f6705694ffd243079bf87 100644 (file)
--- a/lily/include/smobs.tcc
+++ b/lily/include/smobs.tcc
@@ -65,7 +65,7 @@ Smob_base<Super>::register_ptr (Super *p)
 // Defaults, should not actually get called
 template <class Super>
 SCM
-Smob_base<Super>::mark_smob ()
+Smob_base<Super>::mark_smob () const
 {
   return SCM_UNSPECIFIED;
 }

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 223725f462f310b4204627fecf8a4d63457f1156..8c67cd9be54c1d15df96ad47cdc91e97f912d2af 100644 (file)
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -39,7 +39,7 @@ class Source_file : public Smob<Source_file>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Source_file ();
 private:

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 23a5be7fbc41ada9b061c24983159498d6d78b79..6ccb9252bb18a224f5a38ff36b53bda6c30cd94b 100644 (file)
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -58,7 +58,7 @@ using namespace std;
 class Stencil : public Simple_smob<Stencil>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
 private:
   Box dim_;

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 97906c1602da196ab31a84162e59153a447809aa..a7d3a4da1bf8404e8d1173012ebc1790373aa48a 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -50,7 +50,7 @@ struct Translator_method_binding
 class Translator_group : public Smob<Translator_group>
 {
 public:
-  SCM mark_smob ();
+  SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
   virtual ~Translator_group ();

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 22e656ceb842593774b7eb3ced8cf0537ee0e5ba..74f9ecb14628aa4db6731705767f6065a052ac8a 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -97,7 +97,7 @@ public:
   typedef void (Translator::*Grob_info_callback) (Grob_info);
   typedef void (Translator::*Callback) (void);
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
   virtual ~Translator ();
 private:

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 605b790a686675875a13d2db0c72188e34fc3f2f..830f946612543bfda7c5c7c3db09061c3398e610 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -28,7 +28,7 @@ Input dummy_input_global;
 const char Input::type_p_name_[] = "ly:input-location?";
 
 SCM
-Input::mark_smob ()
+Input::mark_smob () const
 {
   if (Source_file *sf = get_source_file ())
     return sf->self_scm ();

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index d9d284864f3676489cd6c6841e52ddd66f1bac22..6d4de7f7fe02b99ea4b9e4502925eaee67a8a15e 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -368,7 +368,7 @@ Lily_lexer::add_lexed_char (int count)
 const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?";
 
 SCM
-Lily_lexer::mark_smob ()
+Lily_lexer::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 170a5e77e4a2736157db88a80a2b0ba87cfdb10d..54b0211d152822a42454047d7044bbf3394f6f71 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -77,7 +77,7 @@ Lily_parser::~Lily_parser ()
 }
 
 SCM
-Lily_parser::mark_smob ()
+Lily_parser::mark_smob () const
 {
   scm_gc_mark (closures_);
   return (lexer_) ? lexer_->self_scm () : SCM_EOL;

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index a9098bcba31d8486ad821f6b4255095a9d6f4591..ced7fa795210b67d14e9f464331bbab8ff441e1d 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -193,7 +193,7 @@ Music_iterator::get_music () const
 const char Music_iterator::type_p_name_[] = "ly:iterator?";
 
 SCM
-Music_iterator::mark_smob ()
+Music_iterator::mark_smob () const
 {
   derived_mark ();
   /*

diff --git a/lily/music-output.cc b/lily/music-output.cc
index 0907bf38f4d6f1707ee7087d53ed8eb822f618b2..dbbf606083e15e3ad1ed9dd73519ce709409574d 100644 (file)
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -42,7 +42,7 @@ Music_output::derived_mark () const
 const char Music_output::type_p_name_[] = "ly:music-output?";
 
 SCM
-Music_output::mark_smob ()
+Music_output::mark_smob () const
 {
   derived_mark ();
   return SCM_EOL;

diff --git a/lily/output-def.cc b/lily/output-def.cc
index b58feaea6c588c6141c6d67f5e39a4aa87566994..4415f83f9d82329a67f06d70458a5a012e8e2d0b 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -63,7 +63,7 @@ Output_def::~Output_def ()
 
 
 SCM
-Output_def::mark_smob ()
+Output_def::mark_smob () const
 {
   /* FIXME: why is this necessary?
      all paper_ should be protected by themselves. */

diff --git a/lily/page-marker.cc b/lily/page-marker.cc
index 1e393862e6b861b1a859602aee3b5a80e54ac927..02b9c4ad19e82c6a00b2a970ea5d098881820ed5 100644 (file)
--- a/lily/page-marker.cc
+++ b/lily/page-marker.cc
@@ -43,7 +43,7 @@ Page_marker::~Page_marker ()
 const char Page_marker::type_p_name_[] = "ly:page-marker?";
 
 SCM
-Page_marker::mark_smob ()
+Page_marker::mark_smob () const
 {
   scm_gc_mark (symbol_);
   scm_gc_mark (permission_);

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index b79041bb7b44eb30c55d433267a46d2718bc9b11..dfa52f4f79f121bbd9f5df5243c904d860adf774 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -54,7 +54,7 @@ Paper_book::~Paper_book ()
 const char Paper_book::type_p_name_[] = "ly:paper-book?";
 
 SCM
-Paper_book::mark_smob ()
+Paper_book::mark_smob () const
 {
   if (paper_)
     scm_gc_mark (paper_->self_scm ());

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 269e1e294c1ceeb18a5edc69205deb06788d4cff..5da493ba48e2a0fbf6bb43782424eee3f9f64d4c 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -62,7 +62,7 @@ Paper_outputter::~Paper_outputter ()
 
 
 SCM
-Paper_outputter::mark_smob ()
+Paper_outputter::mark_smob () const
 {
   scm_gc_mark (output_module_);
   return file_;

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 14151783725519e4c8170f4bb51e712ca78c648a..77726515254e4039794d8291f39510f1285fa58c 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -221,7 +221,7 @@ Pitch::down_to (int notename)
 const char Pitch::type_p_name_[] = "ly:pitch?";
 
 SCM
-Pitch::mark_smob ()
+Pitch::mark_smob () const
 {
   return scale_->self_scm ();
 }

diff --git a/lily/prob.cc b/lily/prob.cc
index 24ce604db90109fa24ac9fd01058b37cceef5ed2..3f6ba2fef1b773a4e5b06ffa8987e798d6a916dc 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -113,7 +113,7 @@ Prob::derived_mark () const
 }
 
 SCM
-Prob::mark_smob ()
+Prob::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 5eb048f6d177694dda7bb88873b5286bc6fdbd57..a9c26c620dd168b1e863f2a279823d525df144e1 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -72,7 +72,7 @@ Scheme_hash_table::~Scheme_hash_table ()
 }
 
 SCM
-Scheme_hash_table::mark_smob ()
+Scheme_hash_table::mark_smob () const
 {
   scm_gc_mark (hash_tab_);
   return SCM_EOL;

diff --git a/lily/score.cc b/lily/score.cc
index 895954a01abbfc0aa534683c9cc753c72d7bd98b..52f9d2ac539d49c442d4cb4f95beb49de1917cfd 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -62,7 +62,7 @@ Score::~Score ()
 const char Score::type_p_name_[] = "ly:score?";
 
 SCM
-Score::mark_smob ()
+Score::mark_smob () const
 {
   scm_gc_mark (header_);
   for (vsize i = defs_.size (); i--;)

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 1118b9d286ee29a823c6ce0b2a7d6041a9ed19aa..b06edbf0b3a6a8af9a780c66dbbe03f9ae632bb3 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -365,7 +365,7 @@ Source_file::get_port () const
 const char Source_file::type_p_name_[] = "ly:source-file?";
 
 SCM
-Source_file::mark_smob ()
+Source_file::mark_smob () const
 {
   return str_port_;
 }

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 980618ceaa5d965fdb8900372d77d60ff0350747..987a879053dd808f7775c4b52ae94eb1d7438b09 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -39,7 +39,7 @@ Stencil::Stencil (Box b, SCM func)
 }
 
 SCM
-Stencil::mark_smob ()
+Stencil::mark_smob () const
 {
   return expr_;
 }

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 73a9c602e031ebd3b17bf332b8001ac18d58c163..fc1c2a8a7b385c90c2aa1127312f05161724d4c2 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -356,7 +356,7 @@ Translator_group::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Translator_group::mark_smob ()
+Translator_group::mark_smob () const
 {
   derived_mark ();
   scm_gc_mark (protected_events_);

diff --git a/lily/translator.cc b/lily/translator.cc
index b20e2aa4edbb7821964412213dd0f8507e999222..54d97c3c19ecb439510cf92f920d3a3bc6624610 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -189,7 +189,7 @@ Translator::static_translator_description (const char *grobs,
   SMOBS
 */
 SCM
-Translator::mark_smob ()
+Translator::mark_smob () const
 {
   derived_mark ();
   return SCM_EOL;

diff --git a/lily/undead.cc b/lily/undead.cc
index 40d831615755dc73560903b8390d81fe0bfb2b3c..db2d6f19e0b9e590f66b56769c0634e29a64117a 100644 (file)
--- a/lily/undead.cc
+++ b/lily/undead.cc
@@ -23,17 +23,17 @@ class Undead : public Simple_smob<Undead>
 {
 public:
   int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
+  SCM mark_smob () const;
   static const char type_p_name_[];
 private:
   SCM object_;
 public:
-  SCM object () { return object_; }
+  SCM object () const { return object_; }
   Undead (SCM object = SCM_UNDEFINED) : object_ (object) { };
 };
 
 SCM
-Undead::mark_smob ()
+Undead::mark_smob () const
 {
   bool saved = parsed_objects_should_be_dead;
   parsed_objects_should_be_dead = false;