Changeset 5e5498e in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

ecb072d

Parents:

a75f3e49

git-author:

Dzejrou <dzejrou@…> (2018-03-02 20:23:47)

git-committer:

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

Message:

cpp: bugfixes

Location:

uspace/lib/cpp

Files:

• Makefile (modified) (1 diff)
• include/impl/mutex.hpp (modified) (1 diff)
• include/impl/thread.hpp (modified) (4 diffs)
• src/mutex.cpp (modified) (2 diffs)

uspace/lib/cpp/Makefile

@@ -42 +42 @@
         src/iostream.cpp \
         src/locale.cpp \
+        src/mutex.cpp \
         src/new.cpp \
         src/string.cpp \

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

@@ -30 +30 @@
 #define LIBCPP_MUTEX
 
+#include <internal/common.hpp>
 #include <thread>
-
-extern "C" {
-#include <fibril_synch.h>
-}
 
 namespace std
 {
+    extern "C" {
+    #include <fibril.h>
+    #include <fibril_synch.h>
+    }
+
     /**
      * 20.4.1.2.1, class mutex:

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

@@ -34 +34 @@
 #include <ostream>
 
-extern "C" {
-    #include <fibril.h>
-    #include <fibril_synch.h>
-}
-
 namespace std
 {
+    extern "C" {
+        #include <fibril.h>
+        #include <fibril_synch.h>
+    }
+
     namespace aux
     {
@@ -225 +225 @@
             auto usecs = chrono::duration_cast<chrono::duration<typename Duration::rep, micro>>(abs_time - now);
 
-            std::fibril_usleep(usecs.count());
+            fibril_usleep(usecs.count());
         }
 
@@ -236 +236 @@
             // TODO: timeouts?
             auto usecs = chrono::duration_cast<chrono::duration<Rep, micro>>(rel_time);
-            std::fibril_usleep(usecs.count());
+            fibril_usleep(usecs.count());
         }
     }
@@ -246 +246 @@
     {
         public:
-            id() noexcept
+            constexpr id() noexcept
                 : id_{}
             { /* DUMMY BODY */ }

uspace/lib/cpp/src/mutex.cpp

@@ -31 +31 @@
 namespace std
 {
-    mutex::mutex()
+    constexpr mutex::mutex() noexcept
         : mtx_{}
     {
@@ -71 +71 @@
     }
 
-    recursive_mutex::recursive_mutex()
+    constexpr recursive_mutex::recursive_mutex() noexcept
         : mtx_{}, lock_level_{}, owner_{}
     {