Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / undo.C

diff --git a/src/undo.C b/src/undo.C
index 22b318117661d8bf2891ab120a8bd907302daa4f..b35ab68a5707164759873311d4f34866eda6bd9c 100644 (file)
--- a/src/undo.C
+++ b/src/undo.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -31,15 +31,27 @@ Undo::Undo(undo_kind kind_arg,
 }
 
 
+#ifndef NEW_INSETS
 Undo::~Undo()
 {
        LyXParagraph * tmppar;
        while (par) {
                tmppar = par;
-               par = par->next;
+               par = par->next_;
                delete tmppar;
        }
 }
+#else
+Undo::~Undo()
+{
+       LyXParagraph * tmppar;
+       while (par) {
+               tmppar = par;
+               par = par->next();
+               delete tmppar;
+       }
+}
+#endif
 
 
 UndoStack::UndoStack()