From a81a1ea30fb1e1ddd98199cd0d6d0e355df88ca5 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 8 May 2003 02:19:10 +0000 Subject: [PATCH] restore from disk crash [SVN r18353] --- example/timer/regex_timer.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/example/timer/regex_timer.cpp b/example/timer/regex_timer.cpp index e1533ed2..9d8b2308 100644 --- a/example/timer/regex_timer.cpp +++ b/example/timer/regex_timer.cpp @@ -103,6 +103,15 @@ istream& getline(istream& is, std::string& s) return is; } #endif +#if defined(__GNUC__) && (__GNUC__ == 3) +istream& getline(istream& is, std::string& s) +{ + std::getline(is, s); + if(s.size() && (s[s.size() -1] == '\r')) + s.erase(s.size() - 1); + return is; +} +#endif int main(int argc, char**argv) @@ -364,3 +373,4 @@ int main(int argc, char**argv) +