Run `make grand-replace'.

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

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index da37b4f9e8004798ccc5fcfa9460146c25310fe3..3c760cf33969953db4d8a31b7a3ca9c9a2c8cf2e 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SMOBS_HH
@@ -96,13 +96,14 @@
 #define DECLARE_BASE_SMOBS(CL)                                 \
   friend class Non_existent_class;                             \
   private:                                                     \
+  static const char* smob_name_; \
   static scm_t_bits smob_tag_;                                 \
   static SCM mark_smob (SCM);                                  \
   static size_t free_smob (SCM s);                             \
   static int print_smob (SCM s, SCM p, scm_print_state*);      \
   public:                                                      \
   static SCM equal_p (SCM a, SCM b);                           \
-  static CL *unsmob (SCM s)                                    \
+  static CL *unsmob (SCM s) __attribute__((pure))              \
   {                                                            \
     if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_)                \
       return (CL *) SCM_CELL_WORD_1 (s);                       \
@@ -142,12 +143,16 @@ void unprotect_smob (SCM smob, SCM *prot_cons);
 
 extern bool parsed_objects_should_be_dead;
 
+#ifndef NDEBUG
 #define ASSERT_LIVE_IS_ALLOWED()     \
   static bool passed_here_once;\
   if (parsed_objects_should_be_dead && !passed_here_once) { \
-    programming_error (string ("Parsed object should be dead: ")  + __PRETTY_FUNCTION__ ); \
+    ::programming_error (string ("Parsed object should be dead: ")  + __PRETTY_FUNCTION__ ); \
     passed_here_once = true;\
   }    
+#else
+#define ASSERT_LIVE_IS_ALLOWED()
+#endif
 
 #endif /* SMOBS_HH */