luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 12:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'type-traits-glib-min-version' into 'master'

Browse Source 
glib/gmacros.h: Move `<type_traits>` include to consumers

Closes #2331

See merge request GNOME/glib!1963
This commit is contained in:
Philip Withnall 2021-02-26 18:13:52 +00:00
commit b3b829e309
5 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gatomic.h
View File

@ -26,6 +26,11 @@
#include <glib/gtypes.h> #include <glib/gtypes.h>
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
/* for glib_typeof */
#include <type_traits>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL

7
glib/gmacros.h
View File

@ -238,7 +238,12 @@
#define glib_typeof(t) __typeof__ (t) #define glib_typeof(t) __typeof__ (t)
#elif defined(__cplusplus) && __cplusplus >= 201103L #elif defined(__cplusplus) && __cplusplus >= 201103L
/* C++11 decltype() is close enough for our usage */ /* C++11 decltype() is close enough for our usage */
#include <type_traits> /* This needs `#include <type_traits>`, but we have guarded this feature with a
* `GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68` check, and such a check
* cannot be enforced in this header due to include ordering requirements.
* Within GLib itself, which use `glib_typeof` need to add the include
* themselves. See other examples in GLib for how to do this.
*/
#define glib_typeof(t) typename std::remove_reference<decltype (t)>::type #define glib_typeof(t) typename std::remove_reference<decltype (t)>::type
#define glib_typeof_2_68 #define glib_typeof_2_68
#endif #endif

5
glib/gmem.h
View File

@ -31,6 +31,11 @@
#include <glib/gutils.h> #include <glib/gutils.h>
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
/* for glib_typeof */
#include <type_traits>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS
/** /**

5
glib/grcbox.h
View File

@ -24,6 +24,11 @@
#include <glib/gmem.h> #include <glib/gmem.h>
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
/* for glib_typeof */
#include <type_traits>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS
GLIB_AVAILABLE_IN_2_58 GLIB_AVAILABLE_IN_2_58

5
gobject/gobject.h
View File

@ -28,6 +28,11 @@
#include <gobject/gsignal.h> #include <gobject/gsignal.h>
#include <gobject/gboxed.h> #include <gobject/gboxed.h>
#if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
/* for glib_typeof */
#include <type_traits>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS
/* --- type macros --- */ /* --- type macros --- */