Changes in uspace/lib/cpp/include/cassert [7dcce0a:7bbf91e] in mainline

File:

• uspace/lib/cpp/include/cassert (modified) (2 diffs)

uspace/lib/cpp/include/cassert

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -30 +30 @@
 #define LIBCPP_CASSERT
 
+#include <__bits/common.hpp>
 
-extern "C" {
-    #include <assert.h>
+namespace std::hel
+{
+    extern "C" {
+        #include <assert.h>
+    }
 }
 
-// TODO: For some reason, this function isn't visible (maybe the
-//       noreturn attribute?), adding a redeclaration here for the
-//       time being.
+namespace std
+{
+    // Note: The only thing imported is assert
+    //       and that is a macro.
+}
 
-extern void __helenos_assert_abort(const char *, const char *, unsigned int);
-
-#define __unimplemented() assert(!"Not implemented!")
+/**
+ * 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