anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation fixes when using lyxstring

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1975 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-05-02 08:18:00 +00:00
parent 69cf41a260
commit 7e8b69acf0
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mathed/ChangeLog
View File

@ -1,3 +1,14 @@
2001-05-02 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* math_macrotemplate.h: do not use explicitely std::string, but
string.
* math_macroarg.C: avoid bringing the whole std:: namespace in
global-land. When you do that, there is an ambiguity between
lyxstring and std::string (which may be defined at the same time).
* formula.C (HandleExtern): add .c_str() to .str() (useful when
using lyxtring)
2001-04-27 André Pönitz <poenitz@htwm.de>

2
src/mathed/formula.C
View File

@ -1419,7 +1419,7 @@ void InsetFormula::HandleExtern(const string & arg, BufferView * bv)
string outfile = "/tmp/lyx2" + arg + ".out";
ostringstream os;
par->WriteNormal(os);
string code = os.str();
string code = os.str().c_str();
string script = "lyx2" + arg + " '" + code + "' " + outfile;
lyxerr << "calling: " << script << endl;
Systemcalls cmd(Systemcalls::System, script, 0);

3
src/mathed/math_macroarg.C
View File

@ -10,8 +10,7 @@
#include "Lsstream.h"
#include "debug.h"
using namespace std;
using std::endl;
MathMacroArgument::MathMacroArgument(int n)
: MathedInset(string(), LM_OT_MACRO_ARG, LM_ST_TEXT),

2
src/mathed/math_macrotemplate.C
View File

@ -12,7 +12,7 @@
#include "debug.h"
#include "Painter.h"
using namespace std;
//using namespace std;
MathMacroTemplate::MathMacroTemplate() :
MathParInset(LM_ST_TEXT, "undefined", LM_OT_MACRO),

2
src/mathed/math_macrotemplate.h
View File

@ -22,7 +22,7 @@ public:
///
MathMacroTemplate();
///
MathMacroTemplate(std::string const & name, int nargs);
MathMacroTemplate(string const & name, int nargs);
///
void WriteDef(std::ostream &, bool fragile) const;
/// Number of arguments