From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 9 Jun 2020 02:04:45 +0000 (+0000)
Subject: Fix clang (with its own libc++) build after 9865de7 (#661)
X-Git-Tag: SQUID_5_0_4~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b632755e7b262a3327616cae6e18d025482a4d3;p=thirdparty%2Fsquid.git

Fix clang (with its own libc++) build after 9865de7 (#661)

Compilers that check allocator/container value_type matching detected a
mismatch because multimap::value_type is _not_ std::pair<key,T> but
std::pair<const key,T>!

Symptoms (when compiling files that include src/PingData.h):

     Allocator::value_type must be same type as value_type
---

diff --git a/src/PingData.h b/src/PingData.h
index a1fc8501fd..c524925421 100644
--- a/src/PingData.h
+++ b/src/PingData.h
@@ -16,7 +16,7 @@
 class PeerSelector;
 class PeerSelectorPingMonitor;
 
-typedef std::pair<timeval, PeerSelector *> WaitingPeerSelector;
+typedef std::pair<const timeval, PeerSelector *> WaitingPeerSelector;
 /// waiting PeerSelector objects, ordered by their absolute deadlines
 typedef std::multimap<timeval, PeerSelector *, std::less<timeval>, PoolingAllocator<WaitingPeerSelector> > WaitingPeerSelectors;
 typedef WaitingPeerSelectors::iterator WaitingPeerSelectorPosition;