More tweaks to the INSTALL notes when using Compaq cxx.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4408 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 1324df28a6f6e2fe7f9cc28f8df951bf5b8b20be..b935d3a85f97a2c121ff9dceae4062de8484c544 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2002-06-13  Angus Leeming  <leeming@lyx.org>
+2002-06-17  Angus Leeming  <leeming@lyx.org>
 
        * INSTALL: how to compile with Compaq cxx on Tru64 Unix.
 

diff --git a/INSTALL b/INSTALL
index 954f999729937cedc0085ce45571cd07836933b9..eef62e211f1a2d96e661af0e5a68251f68254970 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -364,8 +364,27 @@ notify us.
 
     cxx V6.2 will compile LyX out of the box.
     cxx V6.3-020 is also known to work, although there is a bug in
-    /usr/include/cxx/deque. See Angus Leeming <leeming@lyx.org> for the
-    patch.
+    /usr/include/cxx/deque that will break compilation in FormPreferences.C.
+    Compaq are investigating, but a patch that works /now/ is: 
+
+--- /usr/include/cxx/deque_safe Mon Mar  4 21:09:50 2002
++++ /usr/include/cxx/deque      Mon Mar  4 21:09:00 2002
+@@ -570,9 +570,11 @@
+       {
+         if (size() >= x.size())
+           erase(copy(x.begin(), x.end(), begin()), end());
+-        else
+-          copy(x.begin() + size(), x.end(),
+-               inserter(*this,copy(x.begin(),x.begin()+size(),begin())));
++        else {
++         const_iterator mid = x.begin() + difference_type(size());
++         copy(x.begin(), mid, begin());
++         insert(end(), mid, x.end());
++       }
+       }
+       return *this;
+     }
+
     At the time of writing, cxx V6.5-026 is the latest cxx compiler. It is
     /not/ recommended. Not only do the bugs in the system header files still
     exist, but the compiler itself appears to be both buggy and extremely