Changeset d13b67a in mainline for uspace/lib/cpp/src/ios.cpp

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

9400dbe

Parents:

00d9778

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-08 23:49:39)

git-committer:

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

Message:

cpp: fixed minor bugs that prevented ios from compilation

File:

• uspace/lib/cpp/src/ios.cpp (modified) (8 diffs)

uspace/lib/cpp/src/ios.cpp

@@ -31 +31 @@
 namespace std
 {
+    int ios_base::index_{};
+    bool ios_base::sync_{true};
+    long ios_base::ierror_{0};
+    void* ios_base::perror_{nullptr};
+
     ios_base::ios_base()
         : iarray_{}, parray_{}, iarray_size_{}, parray_size_{},
@@ -37 +42 @@
     { /* DUMMY BODY */ }
 
-    ~ios_base::ios_base()
+    ios_base::~ios_base()
     {
         for (auto& callback: callbacks_)
@@ -43 +48 @@
     }
 
-    auto ios_base::flags() -> fmtflags const
+    auto ios_base::flags() const -> fmtflags
     {
         return flags_;
@@ -75 +80 @@
     void ios_base::unsetf(fmtflags fmtfl)
     {
-        flags_ &= ~fmtflags;
+        flags_ &= ~fmtfl;
     }
 
@@ -115 +120 @@
     }
 
-    locale ios_base::get_loc() const
+    locale ios_base::getloc() const
     {
         return locale_;
@@ -156 +161 @@
         if (!parray_)
         {
-            parray_ = new long[initial_size_];
+            parray_ = new void*[initial_size_];
             parray_size_ = initial_size_;
         }
@@ -165 +170 @@
           //       and return perror_.
             size_t new_size = max(parray_size_ * 2, idx + 1);
-            auto tmp = new long[new_size];
+            auto tmp = new void*[new_size];
 
             for (size_t i = 0; i < parray_size_; ++i)
@@ -186 +191 @@
     void ios_base::register_callback(event_callback fn, int index)
     {
-        callbacks.emplace_back(fn, index);
+        callbacks_.emplace_back(fn, index);
     }