From 0fcb87bf476aebaed23bb9984bc03bc1221b8657 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 5 Jul 2023 11:22:40 +0800 Subject: [PATCH 1/2] sigc++config.h.*: Drop Visual Studio noexcept workaround We already need Visual Studio 2017 or later, so this part is not used at all here. --- sigc++config.h.cmake | 5 ----- sigc++config.h.in | 5 ----- sigc++config.h.meson | 5 ----- 3 files changed, 15 deletions(-) diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake index 2c7e943..e4c3a41 100644 --- a/sigc++config.h.cmake +++ b/sigc++config.h.cmake @@ -46,11 +46,6 @@ */ # pragma warning(disable:4251) -#if (_MSC_VER < 1900) && !defined (noexcept) -#define _ALLOW_KEYWORD_MACROS 1 -#define noexcept _NOEXCEPT -#endif - #else /* SIGC_MSC */ #endif /* !SIGC_MSC */ diff --git a/sigc++config.h.in b/sigc++config.h.in index 573bc36..0d3660e 100644 --- a/sigc++config.h.in +++ b/sigc++config.h.in @@ -46,11 +46,6 @@ */ #pragma warning(disable : 4251) -#if (_MSC_VER < 1900) && !defined(noexcept) -#define _ALLOW_KEYWORD_MACROS 1 -#define noexcept _NOEXCEPT -#endif - #else /* SIGC_MSC */ #endif /* !SIGC_MSC */ diff --git a/sigc++config.h.meson b/sigc++config.h.meson index 3027b26..f90dff3 100644 --- a/sigc++config.h.meson +++ b/sigc++config.h.meson @@ -49,11 +49,6 @@ */ #pragma warning(disable : 4251) -#if (_MSC_VER < 1900) && !defined(noexcept) -#define _ALLOW_KEYWORD_MACROS 1 -#define noexcept _NOEXCEPT -#endif - #else /* SIGC_MSC */ #endif /* !SIGC_MSC */ From 61ec29eb729a394f6993e5edba9cd988c7b45d41 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 5 Jul 2023 11:27:07 +0800 Subject: [PATCH 2/2] sigc++config.h.*: Update comment on MSVC warning C4251 This still applies here today, sadly, so make the comment clearer. --- sigc++config.h.cmake | 2 +- sigc++config.h.in | 2 +- sigc++config.h.meson | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake index e4c3a41..8483ad3 100644 --- a/sigc++config.h.cmake +++ b/sigc++config.h.cmake @@ -33,7 +33,7 @@ #ifdef SIGC_MSC /* - * MS VC7 Warning 4251 says that the classes to any member objects in an + * Visual C++ Warning C4251 says that the classes to any member objects in an * exported class must also be exported. Some of the libsigc++ * template classes contain std::list members. MS KB article 168958 says * that it's not possible to export a std::list instantiation due to some diff --git a/sigc++config.h.in b/sigc++config.h.in index 0d3660e..2031e51 100644 --- a/sigc++config.h.in +++ b/sigc++config.h.in @@ -33,7 +33,7 @@ #ifdef SIGC_MSC /* - * MS VC7 Warning 4251 says that the classes to any member objects in an + * Visual C++ Warning C4251 says that the classes to any member objects in an * exported class must also be exported. Some of the libsigc++ * template classes contain std::list members. MS KB article 168958 says * that it's not possible to export a std::list instantiation due to some diff --git a/sigc++config.h.meson b/sigc++config.h.meson index f90dff3..7fe4e76 100644 --- a/sigc++config.h.meson +++ b/sigc++config.h.meson @@ -36,7 +36,7 @@ #ifdef SIGC_MSC /* - * MS VC7 Warning 4251 says that the classes to any member objects in an + * Visual C++ Warning C4251 says that the classes to any member objects in an * exported class must also be exported. Some of the libsigc++ * template classes contain std::list members. MS KB article 168958 says * that it's not possible to export a std::list instantiation due to some