More checks for objects that should not live outside parser.

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index a8f3ac5164c70151d7c67c4d2b10e7296b6f6840..5bd403bce45364763f307fb2014960034e146b58 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -142,12 +142,16 @@ void unprotect_smob (SCM smob, SCM *prot_cons);
 
 extern bool parsed_objects_should_be_dead;
 
+#ifndef NDEDUG
 #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 */
 

diff --git a/lily/skyline.cc b/lily/skyline.cc
index 744cceb4c3219a65fd3e7a5e8d800bc151db1d72..b729e5312b15a56471f9f7b58ca542e0db947281 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -651,6 +651,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Skyline_pair);
 SCM
 Skyline::mark_smob (SCM)
 {
+  ASSERT_LIVE_IS_ALLOWED();
   return SCM_EOL;
 }