Need some std declarations and qualifiers to compile with DEC cxx.

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index c78cb12571ac35df074637a21d2fb2419555fa92..bcfc2a10a243e6173bb87a5c90cdef78a9d589c0 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-25  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * array.h (operator<<):
+       * math_macro.h (dump, operator<<): added std:: qualifier to ostream.
+
+       * math_macrotable.C: added using std::make_pair directive.
+       (dump): added using std::cerr directive here as I guess that this is
+       temporary.
+
 2001-04-20  Allan Rae  <rae@lyx.org>
 
        * formula.C (LocalDispatch): fixed another #warning.  Guess who.

diff --git a/src/mathed/array.h b/src/mathed/array.h
index 79f89e67213ef1b24055de8b48874de76c01831c..e0583eba58831d749637a2e77b67baf52c9b59b4 100644 (file)
--- a/src/mathed/array.h
+++ b/src/mathed/array.h
@@ -145,7 +145,7 @@ private:
 };
 
 inline 
-ostream & operator<<(ostream & os, MathedArray const & ar)
+std::ostream & operator<<(std::ostream & os, MathedArray const & ar)
 {
        ar.dump(os);
        return os;

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 45fc2c91e9ffd5d16dfb128bde8eb206232690ca..6ca04d335b1ec1ca154bbff5754726acdefbd864 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -76,7 +76,7 @@ public:
        ///
        void expand();
        ///
-       void dump(ostream & os) const;
+       void dump(std::ostream & os) const;
        ///
        MathParInset const * arg(int) const;
        ///
@@ -97,7 +97,7 @@ private:
        void operator=(MathMacro const &);
 };
 
-inline ostream & operator<<(ostream & os, MathMacro const & m)
+inline std::ostream & operator<<(std::ostream & os, MathMacro const & m)
 {
        m.dump(os);
        return os;

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index c5ab680d3933c6f5b0cec651ee71e820f8a7ff88..dfbb59c606a554bb2384b746d2e8d31ad0749417 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -17,6 +17,7 @@
 #include "support/LAssert.h"
 
 using std::endl;
+using std::make_pair;
 
 MathMacroTable::table_type MathMacroTable::macro_table;
 
@@ -25,6 +26,8 @@ bool MathMacroTable::built = false;
 
 void MathMacroTable::dump()
 {
+       using std::cerr;
+
        cerr << "\n------------------------------------------\n";
        table_type::const_iterator it;
        for (it = macro_table.begin(); it != macro_table.end(); ++it)