anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation fix when assertions are disabled

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9697 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-03-07 11:03:45 +00:00
parent 87cd77d1fc
commit 1fa17d5389
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2005-03-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxfunc.C (getStatus): fix warning when assertions are disabled
* text3.C:
* lyxfunc.C:
* dociterator.C: include <boost/current_function.hpp>, which is
needed when assertions are disabled.
2005-03-05 Johnathan Burchill <jkerrb@users.sourceforge.net>
* text2.C: fix for stuck cursor when traversing two

1
src/dociterator.C
View File

@ -22,6 +22,7 @@
#include "mathed/math_inset.h"
#include <boost/assert.hpp>
#include <boost/current_function.hpp>
using std::endl;

15
src/lyxfunc.C
View File

@ -90,6 +90,7 @@
#include "support/convert.h"
#include "support/os.h"
#include <boost/current_function.hpp>
#include <boost/filesystem/operations.hpp>
#include <sstream>
@ -156,17 +157,9 @@ bool getStatus(LCursor cursor,
bool res = false;
for ( ; cursor.depth(); cursor.pop()) {
//lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
DocIterator::idx_type & idx = cursor.idx();
DocIterator::idx_type const lastidx = cursor.lastidx();
BOOST_ASSERT(idx <= lastidx);
DocIterator::pit_type & pit = cursor.pit();
DocIterator::pit_type const lastpit = cursor.lastpit();
BOOST_ASSERT(pit <= lastpit);
DocIterator::pos_type & pos = cursor.pos();
DocIterator::pos_type const lastpos = cursor.lastpos();
BOOST_ASSERT(pos <= lastpos);
BOOST_ASSERT(cursor.idx() <= cursor.lastidx());
BOOST_ASSERT(cursor.pit() <= cursor.lastpit());
BOOST_ASSERT(cursor.pos() <= cursor.lastpos());
// The inset's getStatus() will return 'true' if it made
// a definitive decision on whether it want to handle the

2
src/text3.C
View File

@ -61,6 +61,8 @@
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
#include <boost/current_function.hpp>
#include <clocale>
#include <sstream>