This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=29684731af629e9103306b7716663e44224e6cab commit 29684731af629e9103306b7716663e44224e6cab (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Fri Aug 2 01:45:17 2024 +0200 lib: Remove compatibility code for C++ earlier than C++11 We have made the build system require this at configure time, so there is no point in supporting earlier versions in the library and headers. --- lib/compat/compat.h | 13 ------------- lib/dpkg/macros.h | 5 +---- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/lib/compat/compat.h b/lib/compat/compat.h index 861299c8a..8c643f524 100644 --- a/lib/compat/compat.h +++ b/lib/compat/compat.h @@ -86,19 +86,6 @@ #define LIBCOMPAT_ATTR_ENUM_FLAGS #endif -/* For C++, define a __func__ fallback in case it's not natively supported. */ -#if defined(__cplusplus) && __cplusplus < 201103L -# if LIBCOMPAT_GCC_VERSION >= 0x0200 -# define __func__ __PRETTY_FUNCTION__ -# else -# define __func__ __FUNCTION__ -# endif -#endif - -#if defined(__cplusplus) && __cplusplus < 201103L -#define nullptr 0 -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/lib/dpkg/macros.h b/lib/dpkg/macros.h index 277e67ec5..65a34fdf8 100644 --- a/lib/dpkg/macros.h +++ b/lib/dpkg/macros.h @@ -149,12 +149,9 @@ #define DPKG_ATTR_ENUM_FLAGS #endif -#if defined(__cplusplus) && __cplusplus >= 201103L +#if defined(__cplusplus) #define DPKG_ATTR_THROW(exception) #define DPKG_ATTR_NOEXCEPT noexcept -#elif defined(__cplusplus) -#define DPKG_ATTR_THROW(exception) throw(exception) -#define DPKG_ATTR_NOEXCEPT throw() #endif #ifdef __cplusplus -- Dpkg.Org's dpkg
