anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mathed compile fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2989 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-11-08 15:12:33 +00:00
parent f34e4919f7
commit c090ca491f
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mathed/ChangeLog
View File

@ -1,3 +1,10 @@
2001-11-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* math_arrayinset.C (MathArrayInset):
* formula.C (pipeThroughMaple):
(pipeThroughOctave): add ugly .c_str() to help compile
with lyxstring
2001-11-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-11-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* math_inset.C: compilation fix * math_inset.C: compilation fix

8
src/mathed/formula.C
View File

@ -100,7 +100,7 @@ namespace {
ostringstream os; ostringstream os;
MapleStream ms(os); MapleStream ms(os);
ms << ar; ms << ar;
string expr = os.str(); string expr = os.str().c_str();
for (int i = 0; i < 100; ++i) { // at most 100 attempts for (int i = 0; i < 100; ++i) { // at most 100 attempts
// try to fix missing '*' the hard way by using mint // try to fix missing '*' the hard way by using mint
@ -114,7 +114,7 @@ namespace {
string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";"); string out = captureOutput("mint -i 1 -S -s -q -q", expr + ";");
if (out.empty()) if (out.empty())
break; // expression syntax is ok break; // expression syntax is ok
istringstream is(out); istringstream is(out.c_str());
string line; string line;
getline(is, line); getline(is, line);
if (line.find("on line") != 0) if (line.find("on line") != 0)
@ -146,7 +146,7 @@ namespace {
ostringstream os; ostringstream os;
OctaveStream vs(os); OctaveStream vs(os);
vs << ar; vs << ar;
string expr = os.str(); string expr = os.str().c_str();
string out; string out;
for (int i = 0; i < 100; ++i) { // at most 100 attempts for (int i = 0; i < 100; ++i) { // at most 100 attempts
@ -165,7 +165,7 @@ namespace {
break; break;
// search line with single caret // search line with single caret
istringstream is(out); istringstream is(out.c_str());
string line; string line;
while (is) { while (is) {
getline(is, line); getline(is, line);

4
src/mathed/math_arrayinset.C
View File

@ -25,11 +25,11 @@ MathArrayInset::MathArrayInset(string const & str)
: MathGridInset(1, 1) : MathGridInset(1, 1)
{ {
vector< vector<string> > dat; vector< vector<string> > dat;
istringstream is(str); istringstream is(str.c_str());
while (is) { while (is) {
string line; string line;
getline(is, line); getline(is, line);
istringstream ls(line); istringstream ls(line.c_str());
typedef std::istream_iterator<string> iter; typedef std::istream_iterator<string> iter;
vector<string> v = vector<string>(iter(ls), iter()); vector<string> v = vector<string>(iter(ls), iter());
if (v.size()) if (v.size())