From 7149af4125f76422e320c3d1f9d9308e9259bdf9 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 23 Dec 2020 17:23:49 +0100 Subject: [PATCH] libdpkg: Do not define the clamp macro when compiling C++ code Newer versions of the C++ standard define a clamp function in the STL, which gets messed up by our macro. Reported-by: Helmut Grohne Warned-by: g++ -std=gnu++17 Changelog: internal reference: https://git.dpkg.org/git/dpkg/dpkg.git/commit/?id=7149af4125f76422e320c3d1f9d9308e9259bdf9 --- lib/dpkg/macros.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/dpkg/macros.h b/lib/dpkg/macros.h index 6eaedf844..a4776570a 100644 --- a/lib/dpkg/macros.h +++ b/lib/dpkg/macros.h @@ -153,9 +153,12 @@ * @param l The low limit. * @param h The high limit. */ +/* For C++ use native implementations from STL or similar. */ +#ifndef __cplusplus #ifndef clamp #define clamp(v, l, h) ((v) > (h) ? (h) : ((v) < (l) ? (l) : (v))) #endif +#endif /** @} */ -- 2.41.0