[glib: 1/2] gmacros.h: avoid using _Static_assert in C++17 mode
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] gmacros.h: avoid using _Static_assert in C++17 mode
- Date: Tue, 17 Mar 2020 19:52:20 +0000 (UTC)
commit 0f17659e5a696aa8afe9c5838e092c096ff2dd20
Author: Alexander Pyhalov <apyhalov gmail com>
Date: Tue Mar 17 22:00:05 2020 +0300
gmacros.h: avoid using _Static_assert in C++17 mode
Closes #2067
glib/gmacros.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/glib/gmacros.h b/glib/gmacros.h
index fb14aa81a..45a7874ef 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -736,7 +736,7 @@
#ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
#define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
#define G_PASTE(identifier1,identifier2) G_PASTE_ARGS (identifier1, identifier2)
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#if !defined(__cplusplus) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
#define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false")
#elif (defined(__cplusplus) && __cplusplus >= 201103L) || \
(defined(__cplusplus) && defined (_MSC_VER) && (_MSC_VER >= 1600)) || \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]