Changeset 78449b15 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

5608106c

Parents:

adee838

git-author:

Dzejrou <dzejrou@…> (2018-05-14 17:02:33)

git-committer:

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

Message:

cpp: fixed <cassert>, the assert macro used a function defined in <assert>, which in <cassert> is in the std::hel namespace

File:

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

uspace/lib/cpp/include/cassert

@@ -45 +45 @@
 }
 
+/**
+ * We need to fix the assert macro because it uses
+ * a non-standard function that we have in the
+ * std::hel namespace.
+ */
+#undef assert
+#define assert(expr) \
+        do { \
+                if (!(expr)) \
+                        std::hel::assert_abort(#expr, __FILE__, __LINE__); \
+        } while (0)
+
 #endif