From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 10 Dec 2008 05:16:58 +0000 (+1300)
Subject: Author: Johnathan Conley <johnathan.conley@gmail.com>
X-Git-Tag: SQUID_3_2_0_1~1303
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=dae6fcdb11ea282cecfcbf594babe5d89d0d8fbf;p=thirdparty%2Fsquid.git

Author: Johnathan Conley <johnathan.conley@gmail.com>
Bug 2548: OSX compile error (duplicate symbol ACLStrategised)
---

diff --git a/src/ACLBrowser.cc b/src/ACLBrowser.cc
index 1a2712f17e..6db150b088 100644
--- a/src/ACLBrowser.cc
+++ b/src/ACLBrowser.cc
@@ -41,7 +41,6 @@
 
 /* explicit template instantiation required for some systems */
 
-template class ACLStrategised<char const *>;
 template class ACLRequestHeaderStrategy<HDR_USER_AGENT>;
 
 ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser");
diff --git a/src/ACLStrategised.cc b/src/ACLStrategised.cc
index 85cc1ed934..bc864ae5fb 100644
--- a/src/ACLStrategised.cc
+++ b/src/ACLStrategised.cc
@@ -52,5 +52,5 @@
 /* ACLHTTPRepHeader + ACLHTTPReqHeader */
 template class ACLStrategised<HttpHeader*>;
 
-/* ACLMyPortName + ACLMyPeerName */
+/* ACLMyPortName + ACLMyPeerName + ACLBrowser */
 template class ACLStrategised<const char *>;