From: Angus Leeming <leeming@lyx.org>
Date: Fri, 21 Dec 2001 12:16:10 +0000 (+0000)
Subject: Tiny compile fix.
X-Git-Tag: 1.6.10~20125
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a41a4c065d2d80324f9566c9afa9ab0f143d1037;p=features.git

Tiny compile fix.


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

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b8aa86562..b510959594 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-21  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* tabular_funcs.C: getline -> std::getline
+
 2001-12-21  Juergen Vigna  <jug@sad.it>
 
 	* undo_funcs.C (textHandleUndo): fixed a case where tmppar3 is
diff --git a/src/tabular_funcs.C b/src/tabular_funcs.C
index 2f44fd3e16..724a90ae07 100644
--- a/src/tabular_funcs.C
+++ b/src/tabular_funcs.C
@@ -229,7 +229,7 @@ void l_getline(istream & is, string & str)
 {
 	str.erase();
 	while (str.empty()) {
-		getline(is, str);
+		std::getline(is, str);
 		if (!str.empty() && str[str.length() - 1] == '\r')
 			str.erase(str.length() - 1);
 	}