From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 11 May 2009 01:44:50 +0000 (+1200)
Subject: Fix more Strategised template clashes in MacOS X
X-Git-Tag: SQUID_3_2_0_1~1013
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=343889455cd54b0b87db90f5ed70547f50585650;p=thirdparty%2Fsquid.git

Fix more Strategised template clashes in MacOS X
---

diff --git a/src/acl/MyPort.cc b/src/acl/MyPort.cc
index ffe9c72918..10be8d0b4c 100644
--- a/src/acl/MyPort.cc
+++ b/src/acl/MyPort.cc
@@ -38,12 +38,6 @@
 #include "acl/IntRange.h"
 #include "acl/Checklist.h"
 
-/* explicit template instantiation required for some systems */
-
-template class ACLStrategised<int>;
-
-
-
 int
 ACLMyPortStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
 {
diff --git a/src/acl/SslError.cc b/src/acl/SslError.cc
index 5a19853c3b..33041e6d17 100644
--- a/src/acl/SslError.cc
+++ b/src/acl/SslError.cc
@@ -8,12 +8,6 @@
 #include "acl/SslErrorData.h"
 #include "acl/Checklist.h"
 
-/* explicit template instantiation required for some systems */
-
-template class ACLStrategised<int>;
-
-
-
 int
 ACLSslErrorStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
 {
diff --git a/src/acl/Strategised.cc b/src/acl/Strategised.cc
index bda36470b3..d930a33eec 100644
--- a/src/acl/Strategised.cc
+++ b/src/acl/Strategised.cc
@@ -50,3 +50,6 @@ template class ACLStrategised<HttpHeader*>;
 
 /* ACLMyPortName + ACLMyPeerName + ACLBrowser */
 template class ACLStrategised<const char *>;
+
+/* ACLMyPort + ACLSslError */
+template class ACLStrategised<int>;