From 68a3a474b7ba078908b1065be58cd03a7d3f8e88 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 24 Oct 2001 18:10:21 +0000 Subject: [PATCH] Compilation fixes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2939 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 5 +++++ src/mathed/math_nestinset.C | 2 ++ src/mathed/math_scriptinset.C | 1 + src/mathed/math_scriptinset.h | 4 ++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index c487c47ca5..8d5441fc54 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2001-10-24 Angus Leeming + + * 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 diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index 2cc97de50a..0a9d8affb4 100644 --- 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 9696fa18ee..d8eed93949 100644 --- 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 0bcb5287e4..134db75239 100644 --- 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; ///