Changeset 4529c4b in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

f25d4a4

Parents:

8921188

git-author:

Dzejrou <dzejrou@…> (2018-05-11 00:10:43)

git-committer:

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

Message:

cpp: actual catch bodies are not executed now because of some problems they caused (possibly temporarily)

File:

• uspace/lib/cpp/include/internal/trycatch.hpp (modified) (3 diffs)

uspace/lib/cpp/include/internal/trycatch.hpp

@@ -61 +61 @@
         extern bool exception_thrown;
 
-        /**
-         * These two variables can be used to suppress
-         * the execution of eithe the try blocks
-         * or the catch blocks.
-         */
         inline constexpr bool try_blocks_allowed{true};
-        inline constexpr bool catch_blocks_allowed{false};
     }
 }
@@ -92 +86 @@
 #define LIBCPP_EXCEPTION_IGNORE       /* IGNORE */
 #define LIBCPP_EXCEPTION_HANDLE_THROW LIBCPP_EXCEPTION_IGNORE
-#define LIBCPP_EXCEPTION_HANDLE_CATCH LIBCPP_EXCEPTION_IGNORE
+#define LIBCPP_EXCEPTION_HANDLE_CATCH LIBCPP_EXCEPTION_HANG
 
 #define try if constexpr (::std::aux::try_blocks_allowed)
@@ -107 +101 @@
     { \
         printf("[EXCEPTION] Caught < "#expr" > at %s:%d\n", __FILE__, __LINE__); \
+        ::std::aux::exception_thrown = false; \
         LIBCPP_EXCEPTION_HANDLE_CATCH \
     } \
-    if constexpr (::std::aux::catch_blocks_allowed)
+    if constexpr (false)
 
 /**