thanks
john
--
"Euler's equation contains the five most important numbers in mathematics."
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.85
diff -u -r1.85 ChangeLog
--- ChangeLog 2001/06/25 00:06:23 1.85
+++ ChangeLog 2001/06/25 01:28:01
@@ -1,3 +1,14 @@
+2001-06-25 John Levon <[EMAIL PROTECTED]>
+
+ * math_fracinset.C:
+ * math_root.C:
+ * math_matrixinset.h:
+ * math_matrixinset.h: add std::'s where necessary
+
+ * math_sizeinset.C: add iostream header and using declaration
+
+ * array.C (GetInset): fix compilation on gcc 3.0
+
2001-06-24 The LyX Project <Asger>
* math_inset.C: Cursor movement is better in square roots, among
Index: array.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/array.C,v
retrieving revision 1.23
diff -u -r1.23 array.C
--- array.C 2001/06/25 00:06:30 1.23
+++ array.C 2001/06/25 01:28:02
@@ -96,7 +96,7 @@
if (!isInset(pos))
return 0;
MathInset * p;
- memcpy(&p, bf_.begin() + pos + 1, sizeof(p));
+ memcpy(&p, &bf_[pos + 1], sizeof(p));
return p;
}
Index: math_fracinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_fracinset.C,v
retrieving revision 1.13
diff -u -r1.13 math_fracinset.C
--- math_fracinset.C 2001/06/25 00:06:31 1.13
+++ math_fracinset.C 2001/06/25 01:28:02
@@ -30,7 +30,7 @@
xcell(0).Metrics(st);
xcell(1).Metrics(st);
size_ = st;
- width_ = max(xcell(0).width(), xcell(1).width()) + 4;
+ width_ = std::max(xcell(0).width(), xcell(1).width()) + 4;
ascent_ = xcell(0).height() + 4 + 5;
descent_ = xcell(1).height() + 4 - 5;
}
Index: math_matrixinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_matrixinset.C,v
retrieving revision 1.18
diff -u -r1.18 math_matrixinset.C
--- math_matrixinset.C 2001/06/25 00:06:31 1.18
+++ math_matrixinset.C 2001/06/25 01:28:03
@@ -99,7 +99,7 @@
if (numberedType()) {
int l = 0;
for (int row = 0; row < nrows(); ++row)
- l = max(l, mathed_string_width(LM_TC_TEXTRM, size(),
nicelabel(row)));
+ l = std::max(l, mathed_string_width(LM_TC_TEXTRM, size(),
+nicelabel(row)));
if (l)
width_ += 30 + l;
@@ -223,7 +223,7 @@
}
-vector<string> const MathMatrixInset::getLabelList() const
+std::vector<string> const MathMatrixInset::getLabelList() const
{
std::vector<string> res;
for (int row = 0; row < nrows(); ++row)
Index: math_matrixinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_matrixinset.h,v
retrieving revision 1.11
diff -u -r1.11 math_matrixinset.h
--- math_matrixinset.h 2001/06/25 00:06:32 1.11
+++ math_matrixinset.h 2001/06/25 01:28:03
@@ -47,7 +47,7 @@
///
bool ams() const;
///
- vector<string> const getLabelList() const;
+ std::vector<string> const getLabelList() const;
///
void Validate(LaTeXFeatures & features);
Index: math_root.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_root.C,v
retrieving revision 1.28
diff -u -r1.28 math_root.C
--- math_root.C 2001/06/25 00:06:32 1.28
+++ math_root.C 2001/06/25 01:28:03
@@ -36,8 +36,8 @@
{
MathInset::Metrics(st);
size_ = st;
- ascent_ = max(xcell(0).ascent() + 5, xcell(1).ascent()) + 2;
- descent_ = max(xcell(1).descent() + 5, xcell(0).descent()) + 2;
+ ascent_ = std::max(xcell(0).ascent() + 5, xcell(1).ascent()) + 2;
+ descent_ = std::max(xcell(1).descent() + 5, xcell(0).descent()) + 2;
width_ = xcell(0).width() + xcell(1).width() + 10;
}
@@ -62,7 +62,7 @@
}
-void MathRootInset::Write(ostream & os, bool fragile) const
+void MathRootInset::Write(std::ostream & os, bool fragile) const
{
os << "\\sqrt[";
cell(0).Write(os, fragile);
@@ -72,7 +72,7 @@
}
-void MathRootInset::WriteNormal(ostream & os) const
+void MathRootInset::WriteNormal(std::ostream & os) const
{
os << "[root ";
cell(1).WriteNormal(os);
Index: math_scriptinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_scriptinset.C,v
retrieving revision 1.1
diff -u -r1.1 math_scriptinset.C
--- math_scriptinset.C 2001/06/25 00:06:32 1.1
+++ math_scriptinset.C 2001/06/25 01:28:03
@@ -31,7 +31,7 @@
{
MathInset::Metrics(st);
size_ = st;
- width_ = max(xcell(0).width(), xcell(1).width()) + 2;
+ width_ = std::max(xcell(0).width(), xcell(1).width()) + 2;
ascent_ = xcell(0).height() + 9;
descent_ = xcell(1).height();
}
Index: math_sizeinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_sizeinset.C,v
retrieving revision 1.1
diff -u -r1.1 math_sizeinset.C
--- math_sizeinset.C 2001/06/25 00:06:32 1.1
+++ math_sizeinset.C 2001/06/25 01:28:03
@@ -6,7 +6,10 @@
#include "math_sizeinset.h"
+#include <iostream>
+using std::ostream;
+
MathSizeInset::MathSizeInset(MathStyles st)
: MathInset("", LM_OT_SIMPLE, 1), style_(st)
{
@@ -51,7 +54,7 @@
}
-void MathSizeInset::Write(std::ostream & os, bool fragile) const
+void MathSizeInset::Write(ostream & os, bool fragile) const
{
os << "{\\" << name() << " ";
cell(0).Write(os, fragile);
@@ -59,7 +62,7 @@
}
-void MathSizeInset::WriteNormal(std::ostream & os) const
+void MathSizeInset::WriteNormal(ostream & os) const
{
os << "[" << name() << " ";
cell(0).WriteNormal(os);
