Changeset 52acfab in mainline for uspace/lib/cpp/include/csetjmp

Timestamp:

2019-05-28T19:24:14Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

77de449e

Parents:

af5037d (diff), bebd154 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-28 19:24:14)

git-committer:

GitHub <noreply@…> (2019-05-28 19:24:14)

Message:

Merge pull request #161 from le-jzr/cxxcompat2

C++ compatibility improvements

File:

• uspace/lib/cpp/include/csetjmp (modified) (1 diff)

uspace/lib/cpp/include/csetjmp

@@ -30 +30 @@
 #define LIBCPP_CSETJMP
 
-
-/**
- * TODO: Currently the <setjmp.h> header uses
- *       _Noreturn, which is not available in C++.
- */
-
-namespace std::hel
-{
-    extern "C" {
-        //#include <setjmp.h>
-    }
-}
+#include <setjmp.h>
 
 namespace std
 {
-    /* using std::hel::jmp_buf; */
-    /* using std::hel::longjmp; */
+    using ::jmp_buf;
+    using ::longjmp;
 }
 
-/* using std::hel::jmp_buf; */
-/* using std::hel::longjmp; */
-
 #endif