Changeset de53138 in mainline for uspace/lib/cpp/include/impl

Timestamp:

2018-07-05T21:41:21Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

c71c171

Parents:

6d8a63a

git-author:

Dzejrou <dzejrou@…> (2018-04-20 00:11:54)

git-committer:

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

Message:

cpp: revamped c header wrappers, now only include standard symbols, others are in std::hel, fixed some bugs

Location:

uspace/lib/cpp/include/impl

Files:

• chrono.hpp (modified) (2 diffs)
• ios.hpp (modified) (1 diff)
• iterator.hpp (modified) (1 diff)
• stack.hpp (modified) (2 diffs)
• string.hpp (modified) (5 diffs)
• thread.hpp (modified) (1 diff)
• utility.hpp (modified) (3 diffs)

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

@@ -611 +611 @@
             static time_point now()
             {
-                std::timeval tv{};
-                std::gettimeofday(&tv, nullptr);
+                hel::timeval tv{};
+                hel::gettimeofday(&tv, nullptr);
 
                 rep time = tv.tv_usec;
@@ -654 +654 @@
             static time_point now()
             {
-                std::timeval tv{};
-                std::getuptime(&tv);
+                hel::timeval tv{};
+                hel::getuptime(&tv);
 
                 rep time = tv.tv_usec;

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

@@ -41 +41 @@
 {
     using streamoff = long long;
-    using streamsize = ssize_t;
+    using streamsize = hel::ssize_t;
 
     /**

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

@@ -530 +530 @@
         >
         {
-            using type = remove_reference_t<typename iterator_traits<Iterator>::reference>;
+            using type = remove_reference_t<typename iterator_traits<Iterator>::reference>&&;
         };
     }

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

@@ -48 +48 @@
             using container_type  = Container;
             using value_type      = typename container_type::value_type;
-            using reference       = typename constainer_type::reference;
+            using reference       = typename container_type::reference;
             using const_reference = typename container_type::const_reference;
             using size_type       = typename container_type::size_type;
@@ -132 +132 @@
 
             void swap(stack& other)
-                noexcept(noexcept(swap(c, other.c)))
+                /* noexcept(noexcept(swap(c, other.c))) */
             {
                 std::swap(c, other.c);

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

@@ -44 +44 @@
 namespace std
 {
-
     /**
      * 21.2, char_traits:
@@ -82 +81 @@
         static int compare(const char_type* s1, const char_type* s2, size_t n)
         {
-            return std::str_lcmp(s1, s2, n);
+            return hel::str_lcmp(s1, s2, n);
         }
 
         static size_t length(const char_type* s)
         {
-            return std::str_size(s);
+            return hel::str_size(s);
         }
 
@@ -354 +353 @@
         {
             // TODO: This function does not exits...
-            //return std::wstr_lcmp(s1, s2, n);
+            //return hel::wstr_lcmp(s1, s2, n);
             return 0;
         }
@@ -360 +359 @@
         static size_t length(const char_type* s)
         {
-            return std::wstr_size(s);
+            return hel::wstr_size(s);
         }
 
@@ -448 +447 @@
             /**
              * 21.4.2, construct/copy/destroy:
+             * TODO: tagged constructor that moves the char*
+             *       and use that with asprintf in to_string
              */
+
             basic_string() noexcept
                 : basic_string(allocator_type{})

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

@@ -248 +248 @@
             { /* DUMMY BODY */ }
 
-            fid_t id_; // For testing atm public.
         private:
-            id(fid_t id)
+            aux::thread_t id_;
+
+            id(aux::thread_t id)
                 : id_{id}
             { /* DUMMY BODY */ }

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

@@ -30 +30 @@
 #define LIBCPP_UTILITY
 
+#include <cstdint>
 #include <type_traits>
 
@@ -78 +79 @@
     constexpr T&& forward(remove_reference_t<T>&& t) noexcept
     {
-        // TODO: check if t is lvalue reference, if it is, the program
-        //       is ill-formed according to the standard
         return static_cast<T&&>(t);
     }
@@ -236 +235 @@
     namespace aux
     {
-        template<class T, std::uintmax_t N>
+        template<class T, uintmax_t N>
         struct make_integer_sequence
         {