Changeset f5a77a00 in mainline for uspace/lib/cpp/include/internal/streambufs.hpp

Timestamp:

2018-07-05T21:41:19Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bed3d11

Parents:

2e0256b

git-author:

Dzejrou <dzejrou@…> (2017-12-17 14:57:48)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:19)

Message:

cpp: fixed the stdin stream buffer

File:

• uspace/lib/cpp/include/internal/streambufs.hpp (modified) (2 diffs)

uspace/lib/cpp/include/internal/streambufs.hpp

@@ -82 +82 @@
                     auto c = fgetc(in_);
                     putchar(c); // TODO: Temporary source of feedback.
-                    auto ic = traits_type::to_int_type(c);
-                    if (traits_type::eq_int_type(ic, traits_type::eof()))
+                    if (c == traits_type::eof())
                         break;
 
-                    buffer_[i] = c;
+                    buffer_[i] = static_cast<char_type>(c);
 
-                    if (c == '\n')
+                    if (buffer_[i] == '\n')
+                    {
+                        ++i;
                         break;
+                    }
                 }
 
@@ -103 +105 @@
             int_type uflow() override
             {
-                // TODO: what is the difference between uflow and underflow?
                 auto res = underflow();
-                ++*input_next_;
+                ++input_next_;
 
                 return res;