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 1a2712f17e1f70dd6579dfe8437870dbc01fd36b..6db150b08865d6cbe316c2899d38ce63129553e7 100644 (file)
--- 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 85cc1ed9349a905b8d9f114213cfe0f4d0294238..bc864ae5fbec5aea2d25a5c7d67276799f25924c 100644 (file)
--- 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 *>;