Compilation fixes.

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index c487c47ca5bc32d102e3d6eb1cc2faf31bc346da..8d5441fc541d430b57429e80fd4675928c2be6c8 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-24  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * math_nestinset.C: added using std::max, min directives.
+       * math_scriptinset.C: added using std::ostream directive.
+       * math_scriptinset.h: replaced ostream with std::ostream.
 
 2001-10-17  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 2cc97de50a23d3dc6ed1f45523c7a4cdfa35621f..0a9d8affb4839a08c89bb8af63b17720a173a4e1 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -5,6 +5,8 @@
 #include "math_nestinset.h"
 #include "debug.h"
 
+using std::max;
+using std::min;
 
 MathNestInset::MathNestInset(idx_type nargs)
        : MathDimInset(), cells_(nargs)

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index 9696fa18ee7a8da17d7ca343468d67d522338242..d8eed9394975f5e69015abcd2396ec87c3ec8506 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -13,6 +13,7 @@
 
 #include "math_scriptinset.h"
 
+using std::ostream;
 using std::ostringstream;
 
 

diff --git a/src/mathed/math_scriptinset.h b/src/mathed/math_scriptinset.h
index 0bcb5287e48d58da7c0eed4c535acb57d2302118..134db752390dfefdad8f31a23587260e0001ede6 100644 (file)
--- a/src/mathed/math_scriptinset.h
+++ b/src/mathed/math_scriptinset.h
@@ -23,7 +23,7 @@ public:
        ///
        void write(MathWriteInfo & os) const;
        ///
-       void writeNormal(ostream & os) const;
+       void writeNormal(std::ostream & os) const;
        ///
        void metrics(MathMetricsInfo const & st) const;
        ///
@@ -32,7 +32,7 @@ public:
        ///
        void write(MathInset const *, MathWriteInfo & os) const;
        ///
-       void writeNormal(MathInset const *, ostream & os) const;
+       void writeNormal(MathInset const *, std::ostream & os) const;
        ///
        void metrics(MathInset const * nucleus, MathMetricsInfo const & st) const;
        ///