Compile fix gcc 2.95 + stlport

[lyx.git] / src / mathed / math_arrayinset.C

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 9ccd154006b4e1177802a059f081d0d4a45b22ef..5794ee791354f4dce9325385e3fb74559ceb0054 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -1,19 +1,31 @@
-#include <config.h>
+/**
+ * \file math_arrayinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
+#include <config.h>
 
 #include "math_arrayinset.h"
+#include "math_data.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
-#include "metricsinfo.h"
 #include "math_streamstr.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include <iterator>
 
-using std::vector;
-using std::istringstream;
 using std::getline;
+
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
 using std::istream_iterator;
+using std::vector;
 
 
 MathArrayInset::MathArrayInset(string const & name, int m, int n)
@@ -37,10 +49,10 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
        : MathGridInset(1, 1), name_(name)
 {
        vector< vector<string> > dat;
-       istringstream is(STRCONV(str));
+       istringstream is(str);
        string line;
        while (getline(is, line)) {
-               istringstream ls(STRCONV(line));
+               istringstream ls(line);
                typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
                if (v.size())
@@ -57,18 +69,18 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
 }
 
 
-MathInset * MathArrayInset::clone() const
+auto_ptr<InsetBase> MathArrayInset::clone() const
 {
-       return new MathArrayInset(*this);
+       return auto_ptr<InsetBase>(new MathArrayInset(*this));
 }
 
 
-Dimension MathArrayInset::metrics(MetricsInfo & mi) const
+void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ArrayChanger dummy(mi.base);
        MathGridInset::metrics(mi);
-       metricsMarkers2();
-       return dim_;
+       metricsMarkers2(dim_);
+       dim = dim_;
 }