From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 26 Dec 2001 14:45:16 +0000 (+0000)
Subject: a better(?) compilation fix for cxx
X-Git-Tag: 1.6.10~20119
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7f0644416bb75ea5410333d1f3857d42e2c3bb6b;p=features.git

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 08c9070bc0..5bacfc5753 100644
--- 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 724a90ae07..72d28384a4 100644
--- 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);
 	}