diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-26 23:17:03 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-11-08 14:26:00 +0100 |
| commit | 586d8704716a10e0f8b9c400cab500f5353eebe6 (patch) | |
| tree | 9318582dc8c53a88084ad00c4dfa6d02c83b3ca6 /apt-pkg/contrib/macros.h | |
| parent | 23fb7b2cbbda62c99a199d29ad62205b23d35af4 (diff) | |
replace ignore-deprecated #pragma dance with _Pragma
For compatibility we use/provide and fill quiet some deprecated methods
and fields, which subsequently earns us a warning for using them. These
warnings therefore have to be disabled for these codeparts and that is
what this change does now in a slightly more elegant way.
Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/contrib/macros.h')
| -rw-r--r-- | apt-pkg/contrib/macros.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 3a5e37c63..c0af4b2c8 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -132,6 +132,22 @@ #endif #endif +#if __GNUC__ >= 4 + #define APT_IGNORE_DEPRECATED_PUSH \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") + #define APT_IGNORE_DEPRECATED_POP \ + _Pragma("GCC diagnostic pop") + #define APT_IGNORE_DEPRECATED(XXX) \ + APT_IGNORE_DEPRECATED_PUSH \ + XXX \ + APT_IGNORE_DEPRECATED_POP +#else + #define APT_IGNORE_DEPRECATED_PUSH + #define APT_IGNORE_DEPRECATED_POP + #define APT_IGNORE_DEPRECATED(XXX) XXX +#endif + // These lines are extracted by the makefiles and the buildsystem // Increasing MAJOR or MINOR results in the need of recompiling all // reverse-dependencies of libapt-pkg against the new SONAME. |