On Tue, Feb 03, 2004 at 04:12:13PM +0100, Andre Poenitz spake thusly: > > On Tue, Feb 03, 2004 at 05:14:58PM +0200, Martin Vermeer wrote: > > It sure does help... pretty it is not. > > > > Does it make sense to check this in (attached)? > > Well, I certainly don't like it, but if it is the only way to get this > code past 2.95, just do it. > > > - BOOST_ASSERT(cur.inset() == this); > > + BOOST_ASSERT(cur.inset() == const_cast<MathNestInset *>(this)); > > [But at least mind your spacing...] > > Andre'
It's in -- with corrected spacing. Some further compile fixes attached... OK to go in? (As you see this includes the Baum fix) - Martin
Index: converter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/converter.C,v
retrieving revision 1.96
diff -u -p -r1.96 converter.C
--- converter.C 31 Jan 2004 15:30:20 -0000 1.96
+++ converter.C 3 Feb 2004 16:50:39 -0000
@@ -50,6 +50,7 @@ using std::endl;
using std::find_if;
using std::string;
using std::vector;
+using std::distance;
namespace {
Index: cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/cursor.C,v
retrieving revision 1.45
diff -u -p -r1.45 cursor.C
--- cursor.C 3 Feb 2004 11:49:05 -0000 1.45
+++ cursor.C 3 Feb 2004 16:50:39 -0000
@@ -868,7 +868,7 @@ bool LCursor::openable(MathAtom const &
// we can't move into anything new during selection
if (depth() == anchor_.size())
return false;
- if (t.nucleus() != anchor_[depth()].inset())
+ if (const_cast<MathInset *>(t.nucleus()) != anchor_[depth()].inset())
return false;
return true;
Index: format.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/format.C,v
retrieving revision 1.21
diff -u -p -r1.21 format.C
--- format.C 31 Jan 2004 15:30:21 -0000 1.21
+++ format.C 3 Feb 2004 16:50:39 -0000
@@ -35,6 +35,7 @@ using lyx::support::subst;
using lyx::support::Systemcall;
using std::string;
+using std::distance;
extern LyXServerSocket * lyxsocket;
pgp00000.pgp
Description: PGP signature
