Re: [MERGE] Bug 2252: Build failure on Mac OSX 10.5

From: Amos Jeffries <squid3@dont-contact.us>
Date: Wed, 12 Mar 2008 21:41:02 +1300

Robert Collins wrote:
> On Wed, 2008-03-12 at 14:15 +1300, Amos Jeffries wrote:
>
>> === 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>
>> -
>> ;
>
> forte used to fail to build without the explicit instantiation. It might
> be an idea to #ifdef that; or alternatively, you should remove the
> comment as well as the explicit instantiation.
>
> bb:tweak
>
> -Rob

The type instantiation is not being fully removed, just migrated to
ACLStrategised.cc to prevent duplication errors. The MyPortName ACL now
shares the <char const *> template code previously unique to Browser ACL.

I left the comment on that part because the HDR_USER_AGENT instantiation
is staying and the comment still applies to that code.

Amos

-- 
Please use Squid 2.6STABLE17+ or 3.0STABLE1+
There are serious security advisories out on all earlier releases.
Received on Wed Mar 12 2008 - 02:40:21 MDT

This archive was generated by hypermail pre-2.1.9 : Tue Apr 01 2008 - 13:00:10 MDT