X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.cpp;h=1f4ef6af95ac601c06b0014c3f2ee17516fd33d8;hb=ee41b0f1930604e73f0525864cf3846e7459a449;hp=da946dcbdce4e9ed6391f16ae87622cebfcc2075;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git diff --git a/src/Bullet.cpp b/src/Bullet.cpp index da946dcbdc..1f4ef6af95 100644 --- a/src/Bullet.cpp +++ b/src/Bullet.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Allan Rae * * Full author contact details are available in file CREDITS. @@ -18,7 +18,7 @@ #include "Bullet.h" -#include +#include "support/lassert.h" using namespace std; @@ -348,25 +348,25 @@ docstring const Bullet::bulletEntry(int f, int c) void Bullet::testInvariant() const { #ifdef ENABLE_ASSERTIONS - BOOST_ASSERT(font >= MIN); - BOOST_ASSERT(font < FONTMAX); - BOOST_ASSERT(character >= MIN); - BOOST_ASSERT(character < CHARMAX); - BOOST_ASSERT(size >= MIN); - BOOST_ASSERT(size < SIZEMAX); - BOOST_ASSERT(user_text >= -1); - BOOST_ASSERT(user_text <= 1); + LATTEST(font >= MIN); + LATTEST(font < FONTMAX); + LATTEST(character >= MIN); + LATTEST(character < CHARMAX); + LATTEST(size >= MIN); + LATTEST(size < SIZEMAX); + LATTEST(user_text >= -1); + LATTEST(user_text <= 1); // now some relational/operational tests if (user_text == 1) { - BOOST_ASSERT(font == -1 && (character == -1 && size == -1)); - // BOOST_ASSERT(!text.empty()); // this isn't necessarily an error + LATTEST(font == -1 && (character == -1 && size == -1)); + // LATTEST(!text.empty()); // this isn't necessarily an error } // else if (user_text == -1) { - // BOOST_ASSERT(!text.empty()); // this also isn't necessarily an error + // LATTEST(!text.empty()); // this also isn't necessarily an error // } // else { // // user_text == 0 - // BOOST_ASSERT(text.empty()); // not usually true + // LATTEST(text.empty()); // not usually true // } #endif }