# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20080312011046-073rtlcazaq1fp7e
# target_branch: file:///src/bzr/squid-repo/trunk/
# testament_sha1: 5051b3d7f938c0af347bcdc527fa72d67ac9095d
# timestamp: 2008-03-12 14:15:12 +1300
# message: Bug 2252: Build failure on Mac OSX 10.5
# base_revision_id: hno@squid-cache.org-20080308131653-\
#   xvi4dop2su2fuic0
# 
# Begin patch
=== modified file 'src/ACLBrowser.cc'
--- src/ACLBrowser.cc	2004-12-20 23:30:12 +0000
+++ src/ACLBrowser.cc	2008-03-12 01:10:46 +0000
@@ -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");

=== modified file 'src/ACLMyPortName.cc'
--- src/ACLMyPortName.cc	2008-02-12 05:44:50 +0000
+++ src/ACLMyPortName.cc	2008-03-12 01:10:46 +0000
@@ -41,8 +41,6 @@
 
 /* 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");

=== modified file 'src/ACLStrategised.cc'
--- src/ACLStrategised.cc	2008-02-06 11:05:38 +0000
+++ src/ACLStrategised.cc	2008-03-12 01:10:46 +0000
@@ -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 *>;

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcoHCgQAAspfgAAQUXf//353
XAC////wUAVsdepIEXQi0oTsJJQFHqbCYao9NT0aj1NABk0AAAc0xMBGmBGEYAAAAmEYCSIEQ9BJ
gSaepp6j1AzUyA00HqGmgyUTNIY1BkDTRoAAANAAAkkJoyBqZVP9Eaeqnp6p5HkmyTUep6gGg8oV
uy0z2h5Q+dS1kdlOrbUQMpWilfpthfS3ho2SeozRPZpZKMZKwNZX9QoctYSWpMDJkau4MRicrBs0
nvaM4QL76YxCLSxfG3Rsb57NBsaTmf6S5RX31/7I4PZKcRWMQYBrZV0XnlfBbVpU42q7NCEeCB8m
EEg8bjIxoOmqCIp6IgZMJQlPnUzgREX4gI4CsMFOzzJbfb5sHd0OOYJHkSHWcGXtRz9EFfIQV012
RxmEwAcNSIOHp4UT4BBCga/OGoLsVbm1G5CJjk0BaoZVVrLy+A3n1HLMUzpG8gQzDJE4FRF7BhER
k6/EpKFM05eRAYmGAfUMS9Vhz2LXBykMZKRU6oYeFD+QwMz2Ee/sW91uy3CQ8vEhhGu4xgTzknsk
nCTp1FpLA0Fk61MqrpWYThgvBWmZotxcULgcZXDCLFtGC5r3URjPFUoO0SHETrCReF51iMi7CAWg
9gJk5DzZmEBpDYMStN7yIi3SENpUnSNdgXDjVdaqDKqsw0amBk/HtfueWU3A65WqcomcC0uNow68
xLh3K44KdaFWrT7mtImOzrUyWA2COoY3GhiXWY2MTDARUMdZkXlyJEisiXlRvEe88RuMlNsVg4ft
idzCDcq8TKsksGgUGLOFzBUV2ElpkSIhxB5Faok3HVSo5pMTmwizMRi9HiME0ORwC4U+kuOK+rVG
Sixbs3hQg64UUIM+5Mjp+QdPXCjk4dpCPUuhIl6AZmY7nlgmBhofg7kjvlviaOLdmU7xHVE6j2ND
+yAPLyi2qtOE7TxhJkODQYOhwPA0kI8XhsYgORO0XszNQE5wC1/JULVVDc9OIryzCPwPRMrBXeWQ
jQ5GeP0OZUeR5jzdYRNTUrPtMykzAPHzKZmoVHzBMKxMG9javWRQ8y/mrhGwoegk40PX0O7DysB3
eOFJIcHao651pwUNsORkRSKDiBYjMrQw7kTLEGhmRHFAtOB3h8E4M8BcrQ2RwI4g0p5QpxdOMcbX
1vqyQO8dYqGyKAXOp5LcRTYoXx4ZBVspkiFOTJfRhIMMNXG/haGgHLdSJBEaT90swcxKYDwQVkBY
WGcoOXG8MgmcV8V8lTRy7hFh4qe5cQLRfVurRm7AGCvYxelz7llfgnxcS8EECJzhPFbmFE0dQsvL
Y8cZsg5CmIz+JBeFruhtOa7fsFzjkyImaYxEViNd0A1w2LBdSrA+/dMq46chv0sO0IcFeOkwaMBk
dgWEhRokPm61H+SU2U2SZdiRtyGpI3rSVgmoZ2QdIVd6YLBTU1+RqoKZSvh7OB67QkIjXsoGuu9E
Q9Jg4HGFtdY20RPfwEnjxExc8BftFOSO/nYIt8MleyfarrMx6zthsB/qUIli+ghycPBydQdxTyYz
QMw+Av9C1F4PEMpRrR7r/MzzQyZaipt9LtUXsO1PmpxCiRwDsskbzIvEVpCKgwt3mOZxWaLbCJRw
TlooqniQGNKRFTZGvvgWXOFa5DeBKKAaWFcSw6XDqgBEqxoKgJWiZFF6FJT8h/Qh4j+hRI7EjWgX
/+LuSKcKEhlA4UCA