resolve merge

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

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index 12819f28f524a86aa5742c574834bf2eebdf713c..cf6ffcc9a3fb2f5f4754ffe875b17025885973df 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -1,9 +1,20 @@
 /*
-  smobs.hh -- declare smob related stuff.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SMOBS_HH
@@ -145,13 +156,17 @@ 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__ ); \
-    passed_here_once = true;\
-  }    
+  do { \
+    static bool passed_here_once;\
+    if (parsed_objects_should_be_dead && !passed_here_once) { \
+      ::programming_error (string ("Parsed object should be dead: ")  + __PRETTY_FUNCTION__ ); \
+      passed_here_once = true;\
+    } \
+  } \
+  while (0)
 #else
-#define ASSERT_LIVE_IS_ALLOWED()
+#define ASSERT_LIVE_IS_ALLOWED() do { } \
+  while (0)
 #endif
 
 #endif /* SMOBS_HH */