diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-03-10 15:35:39 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-03-10 15:35:39 +0800 |
| commit | 7ae8115ffaeda517063d5e1ca253366400109d32 (patch) | |
| tree | d7bc9f380113d8fe1bd446cd9bc46109402501be /glib | |
| parent | 6d1b3ed5370b133773b4ffe2d25c61bfbc36d06f (diff) | |
| download | glibmm-7ae8115ffaeda517063d5e1ca253366400109d32.tar.gz | |
glib/glibmmconfig.h.[in|meson]: Clean up MSVC bits
From
https://gitlab.gnome.org/GNOME/glibmm/-/merge_requests/29#note_734668,
it was noted by Kjell that we will always have thread_local, so there is
really no GLIBMM_CAN_USE_THREAD_LOCAL in the code, so we can drop that.
Also drop the Visual Studio 2013 compatibility bits, since we need
Visual Studio 2017 to build glibmm master (C++17 branch), so they won't
be relevant.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/glibmmconfig.h.in | 23 | ||||
| -rw-r--r-- | glib/glibmmconfig.h.meson | 23 |
2 files changed, 0 insertions, 46 deletions
diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in index 7cf76292..b1c2d8db 100644 --- a/glib/glibmmconfig.h.in +++ b/glib/glibmmconfig.h.in @@ -82,29 +82,6 @@ # define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 # pragma warning (disable: 4786 4355 4800 4181) -#if (_MSC_VER < 1900) -/* The C++-11 keywords noexcept and thread_local are supported on - * Visual Studio 2013 via Microsoft-specific extensions, but are - * supported directly in Visual Studio 2015 - */ - -#define _ALLOW_KEYWORD_MACROS 1 - -#ifndef noexcept -#define noexcept _NOEXCEPT -#endif - -#ifndef thread_local -#define thread_local __declspec (thread) -#endif - -#else - -/* thread_local is supported on Visual Studio 2015+ */ -#define GLIBMM_CAN_USE_THREAD_LOCAL 1 - -#endif /* _MSC_VER < 1900 */ - /* We have GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS for Visual Studio 2017+ */ #if (_MSC_VER >= 1910) #define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS 1 diff --git a/glib/glibmmconfig.h.meson b/glib/glibmmconfig.h.meson index 55aa3bac..16b96833 100644 --- a/glib/glibmmconfig.h.meson +++ b/glib/glibmmconfig.h.meson @@ -84,29 +84,6 @@ # define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 # pragma warning (disable: 4786 4355 4800 4181) -#if (_MSC_VER < 1900) -/* The C++-11 keywords noexcept and thread_local are supported on - * Visual Studio 2013 via Microsoft-specific extensions, but are - * supported directly in Visual Studio 2015 - */ - -#define _ALLOW_KEYWORD_MACROS 1 - -#ifndef noexcept -#define noexcept _NOEXCEPT -#endif - -#ifndef thread_local -#define thread_local __declspec (thread) -#endif - -#else - -/* thread_local is supported on Visual Studio 2015+ */ -#define GLIBMM_CAN_USE_THREAD_LOCAL 1 - -#endif /* _MSC_VER < 1900 */ - /* We have GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS for Visual Studio 2017+ */ #if (_MSC_VER >= 1910) #define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS 1 |