Changeset d13b67a in mainline

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

Location:

uspace/lib/cpp

Files:

• include/impl/ios.hpp (modified) (7 diffs)
• include/impl/vector.hpp (modified) (1 diff)
• src/ios.cpp (modified) (8 diffs)

uspace/lib/cpp/include/impl/ios.hpp

@@ -68 +68 @@
 
             using fmtflags = uint16_t;
-            static constexpr fmtflags boolalpha   = 0b'0000'0000'0000'0001;
-            static constexpr fmtflags dec         = 0b'0000'0000'0000'0010;
-            static constexpr fmtflags fixed       = 0b'0000'0000'0000'0100;
-            static constexpr fmtflags hex         = 0b'0000'0000'0000'1000;
-            static constexpr fmtflags internal    = 0b'0000'0000'0001'0000;
-            static constexpr fmtflags left        = 0b'0000'0000'0010'0000;
-            static constexpr fmtflags oct         = 0b'0000'0000'0100'0000;
-            static constexpr fmtflags right       = 0b'0000'0000'1000'0000;
-            static constexpr fmtflags scientific  = 0b'0000'0001'0000'0000;
-            static constexpr fmtflags showbase    = 0b'0000'0010'0000'0000;
-            static constexpr fmtflags showpoint   = 0b'0000'0100'0000'0000;
-            static constexpr fmtflags showpos     = 0b'0000'1000'0000'0000;
-            static constexpr fmtflags skipws      = 0b'0001'0000'0000'0000;
-            static constexpr fmtflags unitbuf     = 0b'0010'0000'0000'0000;
-            static constexpr fmtflags uppercase   = 0b'0100'0000'0000'0000;
+            static constexpr fmtflags boolalpha   = 0b0000'0000'0000'0001;
+            static constexpr fmtflags dec         = 0b0000'0000'0000'0010;
+            static constexpr fmtflags fixed       = 0b0000'0000'0000'0100;
+            static constexpr fmtflags hex         = 0b0000'0000'0000'1000;
+            static constexpr fmtflags internal    = 0b0000'0000'0001'0000;
+            static constexpr fmtflags left        = 0b0000'0000'0010'0000;
+            static constexpr fmtflags oct         = 0b0000'0000'0100'0000;
+            static constexpr fmtflags right       = 0b0000'0000'1000'0000;
+            static constexpr fmtflags scientific  = 0b0000'0001'0000'0000;
+            static constexpr fmtflags showbase    = 0b0000'0010'0000'0000;
+            static constexpr fmtflags showpoint   = 0b0000'0100'0000'0000;
+            static constexpr fmtflags showpos     = 0b0000'1000'0000'0000;
+            static constexpr fmtflags skipws      = 0b0001'0000'0000'0000;
+            static constexpr fmtflags unitbuf     = 0b0010'0000'0000'0000;
+            static constexpr fmtflags uppercase   = 0b0100'0000'0000'0000;
             static constexpr fmtflags adjustfield = left | right | internal;
             static constexpr fmtflags basefield   = dec  | oct   | hex;
@@ -129 +129 @@
 
                 private:
-                    static int init_cnt{};
+                    static int init_cnt;
             };
 
@@ -195 +195 @@
 
         private:
-            static int index_{};
-            static bool sync_{true};
-
-            static long ierror_{0};
-            static long perror_{nullptr};
+            static int index_;
+            static bool sync_;
+
+            static long ierror_;
+            static void* perror_;
             static constexpr size_t initial_size_{10};
 
@@ -282 +282 @@
                     rdstate_ = state | badbit;
 
-                if (((state | (rdbuf_ ? goodbit | badbit)) & exceptions_) == 0)
+                if (((state | (rdbuf_ ? goodbit : badbit)) & exceptions_) == 0)
                     return;
                 // TODO: Else throw failure.
@@ -380 +380 @@
                 width_      = rhs.width_;
                 precision_  = rhs.precision_;
-                fille_      = rhs.fill_;
+                fill_      = rhs.fill_;
                 locale_     = rhs.locale_;
 
-                delete[] iarray;
+                delete[] iarray_;
                 iarray_size_ = rhs.iarray_size_;
                 iarray_ = new long[iarray_size_];
 
                 for (size_t i = 0; i < iarray_size_; ++i)
-                    iarrai_[i] = rhs.iarray_[i];
-
-                delete[] parray;
+                    iarray_[i] = rhs.iarray_[i];
+
+                delete[] parray_;
                 parray_size_ = rhs.parray_size_;
                 parray_ = new long[parray_size_];
 
                 for (size_t i = 0; i < parray_size_; ++i)
-                    iarrai_[i] = rhs.parray_[i];
+                    parray_[i] = rhs.parray_[i];
 
                 for (auto& callback: callbacks_)
@@ -456 +456 @@
                 locale_ = locale();
 
-                iarray = nullptr;
-                parray = nullptr
+                iarray_ = nullptr;
+                parray_ = nullptr;
             }
 
@@ -527 +527 @@
                 swap(iarray_size_);
                 swap(parray_);
-                swap(parray_size_)
+                swap(parray_size_);
             }
 

uspace/lib/cpp/include/impl/vector.hpp

@@ -364 +364 @@
                     resize_with_copy_(size_, next_capacity_());
 
-                allocator_traits<Allocator>::construct(begin() + size_, forward<Args>(args)...);
+                allocator_traits<Allocator>::construct(allocator_,
+                                                       begin() + size_, forward<Args>(args)...);
 
                 return back();

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);
     }