lyxstring compile fixes ; small stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2159 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 859f52a40f531b4ebeb39c872d00457fa6c14559..c0a7e5203bd4a33b740370c6142111c24f1973fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/INSTALL b/INSTALL
index db183465c6d7f2fec654d7fe35858643df7126c9..645f1108dfc0d9200f945e365a71355725fade15 100644 (file)
--- a/INSTALL
+++ b/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 :
 

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 2d115a0151c8c59c1220b9a51bc382f06385f574..7fb0cc1c1ac9246d6f129b559454fd73e84cf937 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -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;

diff --git a/src/ChangeLog b/src/ChangeLog
index 8921964e5451a2a25a28bdb5211ae149e03f3f89..f4f8c70a7fede763513c6e6aa3b689f45f5e9984 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/Spacing.C b/src/Spacing.C
index 61cf42bbcecc320dcab1feeaa958a914f2dfeaa0..103eb91fdcb0689cac04f3719037859f50b54a8f 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -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);
 }

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 406c3d18229dfb0b03d508df3c39579e0033eede..b9074b1433c41678150641bbb73d6d7310aea4c6 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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:

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 18b49617ed1e7e21ee52dbc88716519c6d1e80c3..82f7eeba193a27f87e597fe5c0b3001cce5488e2 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -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;

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 532f8f8856e43468e7f7ba214c9ad5646d6938f2..58bfe884af9a7d5c305b3eaba5d4f6b131d3b711 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -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;

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 14b41778a302d8f4b34289588e25db75dba2a114..8a4db60be5abfaad5c615a168c9c978098ab1802 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -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 `"

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index aa8b80fcb9e9825028bd3b804fd6ff40a6362298..1f732a7db3b8c2ac90e6a87d070f42aae6fd95a7 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -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.

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index ae6c3f1c924b4989a8096033d444ee2c0c28563f..bb4115960515719f88a986afd582715fed28d87d 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -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;