#include <config.h>
#include "math_arrayinset.h"
+#include "math_data.h"
#include "math_parser.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include <iterator>
-using std::vector;
-using std::istringstream;
using std::getline;
-using std::istream_iterator;
+
+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)
: 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())