From 887aad64f6036a57e5d711b059960327b2c4da5e Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 14 Mar 2008 17:40:02 +1300 Subject: [PATCH] Bug #2252: Build failure on Mac OSX 10.5 --- src/ACLBrowser.cc | 4 ---- src/ACLMyPortName.cc | 5 ++--- src/ACLStrategised.cc | 9 +++++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/ACLBrowser.cc b/src/ACLBrowser.cc index d682bc7414..3995438572 100644 --- a/src/ACLBrowser.cc +++ b/src/ACLBrowser.cc @@ -41,11 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategised - -; template class ACLRequestHeaderStrategy - ; ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser"); diff --git a/src/ACLMyPortName.cc b/src/ACLMyPortName.cc index 3108d0bddc..1ec95e0a11 100644 --- a/src/ACLMyPortName.cc +++ b/src/ACLMyPortName.cc @@ -1,6 +1,6 @@ /* - * $Id: ACLMyPortName.cc,v 1.2.2.1 2008/02/27 10:06:42 amosjeffries Exp $ + * $Id: ACLMyPortName.cc,v 1.2 2008/02/11 22:44:50 rousskov Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -34,14 +34,13 @@ */ #include "squid.h" +#include "ProtoPort.h" #include "ACLMyPortName.h" #include "ACLStringData.h" #include "ACLChecklist.h" /* explicit template instantiation required for some systems */ -template class ACLStrategised; - ACL::Prototype ACLMyPortName::RegistryProtoype(&ACLMyPortName::RegistryEntry_, "myportname"); ACLStrategised ACLMyPortName::RegistryEntry_(new ACLStringData, ACLMyPortNameStrategy::Instance(), "myportname"); diff --git a/src/ACLStrategised.cc b/src/ACLStrategised.cc index f3eb4b92fb..52b8b2f7b5 100644 --- a/src/ACLStrategised.cc +++ b/src/ACLStrategised.cc @@ -1,5 +1,5 @@ /* - * $Id: ACLStrategised.cc,v 1.1.4.1 2008/02/06 04:06:46 amosjeffries Exp $ + * $Id: ACLStrategised.cc,v 1.2 2008/02/06 04:05:38 amosjeffries Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -43,12 +43,13 @@ /* * moved template instantiation into ACLStrategized.cc from - * ACLHTTPRepHeader.cc and ACLHTTPReqHeader.cc to compile on + * ACLHTTPRepHeader.cc, ACLHTTPReqHeader.cc, ACLBrowser.cc, + * and ACLMyPortName.cc to compile on * Mac OSX 10.5 Leopard, this corrects a duplicate symbol error */ /* explicit template instantiation required for some systems */ -template class ACLStrategised +template class ACLStrategised; -; +template class ACLStrategised; -- 2.47.2