Changeset ab936440 in mainline for uspace/lib/cpp/include/cassert

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

uspace/lib/cpp/include/cassert

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