RE: compile porblems

[Juergen Vigna]

On 13-Jul-2001 Andre Poenitz wrote:
> 
> Patch attached.

Kayvan does this patch work for you? As much as I understood it should
give the same error. If this patch don't work could you please try the
attached one?

         Jürgen

--
-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._
Dr. Jürgen Vigna        E-Mail:  [EMAIL PROTECTED]
Italienallee 13/N       Tel/Fax: +39-0471-450260 / +39-0471-450253
I-39100 Bozen           Web:     http://www.sad.it/~jug
-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._-._

A diplomat is a person who can tell you to go to hell in such a way that you
actually look forward to the trip.
                -- Caskie Stinnett, "Out of the Red"


Index: src/insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.67
diff -u -p -r1.67 insetcollapsable.C
--- src/insets/insetcollapsable.C       2001/07/12 14:35:38     1.67
+++ src/insets/insetcollapsable.C       2001/07/13 07:46:59
@@ -428,7 +428,7 @@ void InsetCollapsable::toggleInsetCursor
 UpdatableInset * InsetCollapsable::getLockingInset() const
 {
        UpdatableInset * in = inset.getLockingInset();
-       if (&inset == in)
+       if (static_cast<UpdatableInset *>(const_cast<InsetText *>(&inset)) == in)
                return const_cast<InsetCollapsable *>(this);
        return in;
 }
Index: src/insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.27
diff -u -p -r1.27 insetfloat.C
--- src/insets/insetfloat.C     2001/07/12 14:35:38     1.27
+++ src/insets/insetfloat.C     2001/07/13 07:46:59
@@ -244,8 +244,11 @@ bool InsetFloat::insertInsetAllowed(Inse
 {
        if (code == Inset::FLOAT_CODE)
                return false;
-       if (inset.getLockingInset() != this)
+       if (inset.getLockingInset() !=
+               static_cast<UpdatableInset *>(const_cast<InsetFloat *>(this)))
+       {
                return inset.insertInsetAllowed(code);
+       }
        if ((code == Inset::FOOT_CODE) || (code == Inset::MARGIN_CODE))
                return false;
        return true;