src/common/{assert,macros}.h: wrap code in C++ guards

[babeltrace.git] / src / common / assert.h

diff --git a/src/common/assert.h b/src/common/assert.h
index f6a2ed60ae9da3180575a04245a8e1bbdcc3dbe8..dd9b91276730c342c1ee174bc912c52240f4893f 100644 (file)
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -1,34 +1,23 @@
-#ifndef BABELTRACE_ASSERT_INTERNAL_H
-#define BABELTRACE_ASSERT_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright (c) 2018-2019 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2018-2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#ifndef BABELTRACE_ASSERT_INTERNAL_H
+#define BABELTRACE_ASSERT_INTERNAL_H
+
 #include <assert.h>
 #include <glib.h>
 
 #include "common/macros.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BT_HIDDEN
 extern void bt_common_assert_failed(const char *file, int line,
                const char *func, const char *assertion)
                __attribute__((noreturn));
@@ -67,21 +56,12 @@ extern void bt_common_assert_failed(const char *file, int line,
 #define BT_ASSERT_DBG_FUNC
 
 #else /* BT_DEBUG_MODE */
-
-/*
- * When `BT_DEBUG_MODE` is _not_ defined, define BT_ASSERT_DBG() macro
- * to the following to trick the compiler into thinking that the
- * variable passed as condition to the assertion is used. This is to
- * prevent set-but-not-used warnings from the compiler when assertions
- * are disabled. The sizeof() operator also makes sure that the `_cond`
- * expression is not evaluated, thus preventing unwanted side effects.
- *
- * In-depth explanation:
- * https://stackoverflow.com/questions/37411809/how-to-elegantly-fix-this-unused-variable-warning/37412551#37412551
- */
-# define BT_ASSERT_DBG(_cond)  ((void) sizeof((void) (_cond), 0))
+# define BT_ASSERT_DBG(_cond)  BT_USE_EXPR(_cond)
 # define BT_ASSERT_DBG_FUNC    __attribute__((unused))
-
 #endif /* BT_DEBUG_MODE */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* BABELTRACE_ASSERT_INTERNAL_H */