X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.cpp;h=c3093abc753b535286f2fb472c51b75e1e3d270a;hb=f345feecede25b164502abdacf893a36de9ef4ae;hp=2db54cec17d8de12ec8bd889826e1d777184836f;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git diff --git a/src/Bullet.cpp b/src/Bullet.cpp index 2db54cec17..c3093abc75 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,9 +18,9 @@ #include "Bullet.h" -#include +#include "support/lassert.h" -using std::string; +using namespace std; namespace lyx { @@ -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); + LASSERT(font >= MIN, /**/); + LASSERT(font < FONTMAX, /**/); + LASSERT(character >= MIN, /**/); + LASSERT(character < CHARMAX, /**/); + LASSERT(size >= MIN, /**/); + LASSERT(size < SIZEMAX, /**/); + LASSERT(user_text >= -1, /**/); + LASSERT(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 + LASSERT(font == -1 && (character == -1 && size == -1), /**/); + // LASSERT(!text.empty(), /**/); // this isn't necessarily an error } // else if (user_text == -1) { - // BOOST_ASSERT(!text.empty()); // this also isn't necessarily an error + // LASSERT(!text.empty(), /**/); // this also isn't necessarily an error // } // else { // // user_text == 0 - // BOOST_ASSERT(text.empty()); // not usually true + // LASSERT(text.empty(), /**/); // not usually true // } #endif }