luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-07 13:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'msvc-static-assert' into 'master'

Browse Source 
gmacros.h: Use static_assert on MSVC if possible

See merge request GNOME/glib!964
This commit is contained in:
Philip Withnall 2019-07-02 10:13:19 +00:00
commit 01bc57576b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmacros.h
View File

@ -736,7 +736,9 @@
#define G_PASTE(identifier1,identifier2) G_PASTE_ARGS (identifier1, identifier2) #define G_PASTE(identifier1,identifier2) G_PASTE_ARGS (identifier1, identifier2)
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
#define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false") #define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false")
#elif defined(__cplusplus) && __cplusplus >= 201103L #elif (defined(__cplusplus) && __cplusplus >= 201103L) || \
(defined(__cplusplus) && defined (_MSC_VER) && (_MSC_VER >= 1600)) || \
(defined (_MSC_VER) && (_MSC_VER >= 1800))
#define G_STATIC_ASSERT(expr) static_assert (expr, "Expression evaluates to false") #define G_STATIC_ASSERT(expr) static_assert (expr, "Expression evaluates to false")
#else #else
#ifdef __COUNTER__ #ifdef __COUNTER__