a better(?) compilation fix for cxx

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 08c9070bc0e1d3be4ac0b305869df1428ca16f7c..5bacfc57530e495c85fd91d22ec6de6d8ff5dc3a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-26  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * tabular_funcs.C: use a "using std::getline" instead of the
+       previous fix from Angus (necessary for cxx + lyxstring)
+
 2001-12-24  Juergen Vigna  <jug@sad.it>
 
        * BufferView_pimpl.C (tripleClick): fixed for InsetText.

diff --git a/src/tabular_funcs.C b/src/tabular_funcs.C
index 724a90ae07741f4a7469647430c2ae85e471c87d..72d28384a481154535b225a8c1d5b5c3aa733f94 100644 (file)
--- a/src/tabular_funcs.C
+++ b/src/tabular_funcs.C
@@ -22,6 +22,7 @@
 #include "support/LIstream.h"
 
 using std::istream;
+using std::getline;
 
 // Perfect case for a template... (Lgb)
 // or perhaps not...
@@ -229,7 +230,7 @@ void l_getline(istream & is, string & str)
 {
        str.erase();
        while (str.empty()) {
-               std::getline(is, str);
+               getline(is, str);
                if (!str.empty() && str[str.length() - 1] == '\r')
                        str.erase(str.length() - 1);
        }