mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
lyxstring compile fixes ; small stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2159 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c21c01ce34
commit
ab254289c8
@ -1,3 +1,7 @@
|
||||
2001-06-29 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* INSTALL: change RedHat stuff to insist on updating gcc
|
||||
|
||||
2001-06-14 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* Makefile.am: no point in including 200k historical
|
||||
|
11
INSTALL
11
INSTALL
@ -308,14 +308,9 @@ notify us.
|
||||
are needed for compilation). A 'make symlinks' in linux kernel
|
||||
sources fixes that.
|
||||
|
||||
o if you are using the standard compiler that comes with RedHat Linux 7.0
|
||||
(rpm versions 69 or below), it is known to miscompile LyX under some
|
||||
circumstances. Compiling without optimisation seems to work :
|
||||
|
||||
CXXFLAGS="-g"
|
||||
./configure ...
|
||||
|
||||
You must use at least gcc 2.96-69 to compile LyX (check "rpm -q gcc").
|
||||
o if you are using RedHat Linux 7.x, you must make sure you have the
|
||||
latest updated gcc and related packages installed (at least -85),
|
||||
or LyX will not compile or will be mis-compiled.
|
||||
|
||||
o if you get an error message when compiling LyX that looks like this :
|
||||
|
||||
|
@ -2598,7 +2598,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
|
||||
cur_value = par->params().spacing().getValue();
|
||||
}
|
||||
|
||||
istringstream istr(argument);
|
||||
istringstream istr(argument.c_str());
|
||||
|
||||
string tmp;
|
||||
istr >> tmp;
|
||||
|
@ -1,3 +1,10 @@
|
||||
2001-06-29 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* lyxfunc.C (Dispatch):
|
||||
* Spacing.C (set):
|
||||
* BufferView_pimpl.C (Dispatch): use .c_str() on istringstream
|
||||
constructor argument.
|
||||
|
||||
2001-06-29 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
||||
|
||||
* paragraph.C (Paragraph): dont't clear, and just set layout.
|
||||
|
@ -59,7 +59,7 @@ void Spacing::set(Spacing::Space sp, float val)
|
||||
void Spacing::set(Spacing::Space sp, string const & val)
|
||||
{
|
||||
float fval;
|
||||
istringstream istr(val);
|
||||
istringstream istr(val.c_str());
|
||||
istr >> fval;
|
||||
set(sp, fval);
|
||||
}
|
||||
|
@ -1,3 +1,8 @@
|
||||
2001-06-29 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* insettext.C (localDispatch): use .c_str() on istringstream
|
||||
constructor argument.
|
||||
|
||||
2001-06-29 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* insettoc.h:
|
||||
|
@ -1056,7 +1056,7 @@ InsetText::localDispatch(BufferView * bv,
|
||||
cur_value = par->params().spacing().getValue();
|
||||
}
|
||||
|
||||
std::istringstream istr(arg);
|
||||
std::istringstream istr(arg.c_str());
|
||||
string tmp;
|
||||
istr >> tmp;
|
||||
Spacing::Space new_spacing = cur_spacing;
|
||||
|
@ -1264,7 +1264,7 @@ string const LyXFunc::Dispatch(int ac,
|
||||
#else
|
||||
string file_name;
|
||||
int row;
|
||||
istringstream istr(argument);
|
||||
istringstream istr(argument.c_str());
|
||||
istr >> file_name >> row;
|
||||
#endif
|
||||
// Must replace extension of the file to be .lyx and get full path
|
||||
@ -1287,7 +1287,7 @@ string const LyXFunc::Dispatch(int ac,
|
||||
|
||||
case LFUN_GOTO_PARAGRAPH:
|
||||
{
|
||||
istringstream istr(argument);
|
||||
istringstream istr(argument.c_str());
|
||||
|
||||
int id;
|
||||
istr >> id;
|
||||
|
@ -278,7 +278,7 @@ int LyXRC::read(string const & filename)
|
||||
lexrc.setFile(filename);
|
||||
if (!lexrc.IsOK()) return -2;
|
||||
|
||||
lyxerr[Debug::INIT] << "Reading '" << filename << "'..." << endl;
|
||||
lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
|
||||
|
||||
while (lexrc.IsOK()) {
|
||||
// By using two switches we take advantage of the compiler
|
||||
@ -707,7 +707,7 @@ int LyXRC::read(string const & filename)
|
||||
}
|
||||
|
||||
if ((action = lyxaction.LookupFunc(cmd))>= 0) {
|
||||
if (lyxerr.debugging(Debug::KBMAP)) {
|
||||
if (lyxerr.debugging(Debug::LYXRC)) {
|
||||
lyxerr << "RC_BIND: Sequence `"
|
||||
<< seq << "' Command `"
|
||||
<< cmd << "' Action `"
|
||||
@ -715,7 +715,7 @@ int LyXRC::read(string const & filename)
|
||||
}
|
||||
res = toplevel_keymap->bind(seq, action);
|
||||
if (res != 0
|
||||
&& lyxerr.debugging(Debug::KBMAP)) {
|
||||
&& lyxerr.debugging(Debug::LYXRC)) {
|
||||
lexrc.printError(
|
||||
"RC_BIND: "
|
||||
"Invalid key sequence `"
|
||||
|
@ -1,3 +1,8 @@
|
||||
2001-06-29 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* formulabase.C (localDispatch): use .c_str() on istringstream
|
||||
constructor argument.
|
||||
|
||||
2001-06-27 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* math_grid.C (addCol): add second argument to cellinfo_.insert.
|
||||
|
@ -553,7 +553,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
|
||||
int y;
|
||||
int x1;
|
||||
int y1;
|
||||
istringstream is(arg);
|
||||
istringstream is(arg.c_str());
|
||||
is >> x >> y;
|
||||
lyxerr << "LFUN_SETXY: x: " << x << " y: " << y << "\n";
|
||||
par_->GetXY(x1, y1);
|
||||
@ -667,7 +667,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
|
||||
int n = 1;
|
||||
string v_align;
|
||||
string h_align;
|
||||
istringstream is(arg);
|
||||
istringstream is(arg.c_str());
|
||||
is >> m >> n >> v_align >> h_align;
|
||||
MathArrayInset * p = new MathArrayInset(m, n);
|
||||
p->valign(v_align[0]);
|
||||
@ -688,7 +688,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
|
||||
if (arg.empty())
|
||||
break;
|
||||
|
||||
istringstream is(arg);
|
||||
istringstream is(arg.c_str());
|
||||
string lt;
|
||||
string rt;
|
||||
is >> lt >> rt;
|
||||
|
Loading…
Reference in New Issue
Block a user