]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix more Strategised template clashes in MacOS X
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 11 May 2009 01:44:50 +0000 (13:44 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 11 May 2009 01:44:50 +0000 (13:44 +1200)
src/acl/MyPort.cc
src/acl/SslError.cc
src/acl/Strategised.cc

index ffe9c72918c0138d64109cabbdb9d56a53db135d..10be8d0b4ceff0da072c51c0cf6886f28fc75af0 100644 (file)
 #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)
 {
index 5a19853c3b89cab90da3bdc62922448b41cfe8fe..33041e6d1767b7ff7b036b8bab030811a891f8e6 100644 (file)
@@ -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)
 {
index bda36470b3dfc9ca28ae816eead62eec50fe37cf..d930a33eecc76a45fb22671e0eb6ddd6a3356802 100644 (file)
@@ -50,3 +50,6 @@ template class ACLStrategised<HttpHeader*>;
 
 /* ACLMyPortName + ACLMyPeerName + ACLBrowser */
 template class ACLStrategised<const char *>;
+
+/* ACLMyPort + ACLSslError */
+template class ACLStrategised<int>;