Bug #2166 - Error compiling on Mac OS X 10.5 Leopard

diff --git a/src/ACLHTTPRepHeader.cc b/src/ACLHTTPRepHeader.cc
index 9935c40f596f5c7754c2864e02cace23ecc0e114..8aa0e3a753e9b971ce147af4f506f37b2f676343 100644 (file)
--- a/src/ACLHTTPRepHeader.cc
+++ b/src/ACLHTTPRepHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLHTTPRepHeader.cc,v 1.1 2006/06/14 19:18:24 serassio Exp $
+ * $Id: ACLHTTPRepHeader.cc,v 1.1.4.1 2008/02/06 04:06:46 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,12 +39,6 @@
 #include "ACLChecklist.h"
 #include "HttpReply.h"
 
-/* explicit template instantiation required for some systems */
-
-template class ACLStrategised<HttpHeader*>
-
-;
-
 ACL::Prototype ACLHTTPRepHeader::RegistryProtoype(&ACLHTTPRepHeader::RegistryEntry_, "rep_header");
 
 ACLStrategised<HttpHeader*> ACLHTTPRepHeader::RegistryEntry_(new ACLHTTPHeaderData, ACLHTTPRepHeaderStrategy::Instance(), "rep_header");

diff --git a/src/ACLHTTPReqHeader.cc b/src/ACLHTTPReqHeader.cc
index c71421a44b5f92eb0c57c234635b8d1390077a3b..e337c1f3e4f91de9e7ba4be2a70997c2b4f399ac 100644 (file)
--- a/src/ACLHTTPReqHeader.cc
+++ b/src/ACLHTTPReqHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLHTTPReqHeader.cc,v 1.1 2006/06/14 19:18:24 serassio Exp $
+ * $Id: ACLHTTPReqHeader.cc,v 1.1.4.1 2008/02/06 04:06:46 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,12 +39,6 @@
 #include "ACLChecklist.h"
 #include "HttpRequest.h"
 
-/* explicit template instantiation required for some systems */
-
-template class ACLStrategised<HttpHeader*>
-
-;
-
 ACL::Prototype ACLHTTPReqHeader::RegistryProtoype(&ACLHTTPReqHeader::RegistryEntry_, "req_header");
 
 ACLStrategised<HttpHeader*> ACLHTTPReqHeader::RegistryEntry_(new ACLHTTPHeaderData, ACLHTTPReqHeaderStrategy::Instance(), "req_header");

diff --git a/src/ACLStrategised.cc b/src/ACLStrategised.cc
index ec7e2dbe2782d049a0acb5aafeadd01abc73c002..f3eb4b92fbf06dd6a5d7b6a15d3a89eb7d808367 100644 (file)
--- a/src/ACLStrategised.cc
+++ b/src/ACLStrategised.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLStrategised.cc,v 1.1 2003/02/17 07:01:34 robertc Exp $
+ * $Id: ACLStrategised.cc,v 1.1.4.1 2008/02/06 04:06:46 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -41,3 +41,14 @@
 #include "ACLRegexData.h"
 #include "ACLDomainData.h"
 
+/* 
+ *  moved template instantiation into ACLStrategized.cc from
+ *  ACLHTTPRepHeader.cc and ACLHTTPReqHeader.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*>
+
+;