Bug #2252: Build failure on Mac OSX 10.5

diff --git a/src/ACLBrowser.cc b/src/ACLBrowser.cc
index d682bc74146abe5fbdcee35dcb7e458883e56d0f..399543857206aa630b9a4a9ea1677605a9d9f06d 100644 (file)
--- a/src/ACLBrowser.cc
+++ b/src/ACLBrowser.cc
@@ -41,11 +41,7 @@
 
 /* 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/ACLMyPortName.cc b/src/ACLMyPortName.cc
index 3108d0bddca0f6a4ba8b2cd393740e7e7c3bb1d2..1ec95e0a1128a5a936cab35ce9ce8433dfaaee5f 100644 (file)
--- 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<const char *>;
-
 ACL::Prototype ACLMyPortName::RegistryProtoype(&ACLMyPortName::RegistryEntry_, "myportname");
 
 ACLStrategised<const char *> ACLMyPortName::RegistryEntry_(new ACLStringData, ACLMyPortNameStrategy::Instance(), "myportname");

diff --git a/src/ACLStrategised.cc b/src/ACLStrategised.cc
index f3eb4b92fbf06dd6a5d7b6a15d3a89eb7d808367..52b8b2f7b5d8ec338c79016c109a90a12f715456 100644 (file)
--- 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<HttpHeader*>
+template class ACLStrategised<HttpHeader*>;
 
-;
+template class ACLStrategised<char const *>;