X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsmobs.hh;h=cbf956b578ad2d09aaa144bec55f13505504f686;hb=f018757016404595c92e21346ae0661dafe7ea46;hp=3c760cf33969953db4d8a31b7a3ca9c9a2c8cf2e;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index 3c760cf339..cbf956b578 100644 --- 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--2010 Han-Wen Nienhuys - (c) 1999--2008 Han-Wen Nienhuys + 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 . */ #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 */