From 4f0435754fbd8c7bded12ce5e1feee75954b2f3a Mon Sep 17 00:00:00 2001 From: S6066 Date: Sat, 30 Sep 2017 14:23:42 +0200 Subject: [PATCH] Fixed Nz::String's implementation of std::geltine (#136) * Fix Nz::String's std::getline * Bugfix * Bugfix again --- src/Nazara/Core/String.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp index 98a8b882c..2551ceb34 100644 --- a/src/Nazara/Core/String.cpp +++ b/src/Nazara/Core/String.cpp @@ -5975,20 +5975,7 @@ namespace std istream& getline(istream& is, Nz::String& str) { - str.Clear(); - - char c; - - for (;;) - { - is.get(c); - if (c != '\n' && c != '\0') - str += c; - else - break; - } - - return is; + return getline(is, str, is.widen('\n')); } /*! @@ -6012,7 +5999,11 @@ namespace std if (c != delim && c != '\0') str += c; else + { + if (c == '\0') + is.setstate(std::ios_base::eofbit); break; + } } return is;