From eaba85cb18cb384105b97e20245db3ecf629efa8 Mon Sep 17 00:00:00 2001 From: Patrick Welche Date: Wed, 29 Jun 2016 11:24:24 -0600 Subject: [PATCH] Bug 4376: clang cannot build Squid eCAP code This change is not needed for libecap v1.0 that uses tr1::shared_ptr. However, libecap is being updated to use std::shared_ptr. Once that update is complete, Squid eCAP code will no longer compile because the implicit conversion of shared_ptr to bool in tr1 was deemed dangerous and, hence, made "explicit" when shared_ptr became standard. Unlike "if" statements, "return" statements do not trigger an explicit conversion. --- src/adaptation/ecap/ServiceRep.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index 7577c1b213..f29c10f564 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -236,7 +236,7 @@ bool Adaptation::Ecap::ServiceRep::probed() const bool Adaptation::Ecap::ServiceRep::up() const { - return theService; + return bool(theService); } bool Adaptation::Ecap::ServiceRep::wantsUrl(const SBuf &urlPath) const -- 2.47.3