Re: [MERGE] Bug 2252: Build failure on Mac OSX 10.5
Henrik Nordstrom has voted abstain. Status is now: Semi-approved Comment: Not familiar with the fine details about templates to say if this is good or bad.. but if it doesn't break other platforms I am fine with it. For details, see: http://squid-cache.org/bundlebuggy//request/%3C20080312011528.8D6EAE6EEE%40treenet.co.nz%3E
Re: [MERGE] Bug 2252: Build failure on Mac OSX 10.5
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 + +++ src/ACLBrowser.cc 2008-03-12 01:10:46 + @@ -41,11 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategisedchar const * - -; template class ACLRequestHeaderStrategyHDR_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.
Re: [MERGE] Bug 2252: Build failure on Mac OSX 10.5
Bundle Buggy has detected this merge request. For details, see: http://squid-cache.org/bundlebuggy//request/%3C20080312011528.8D6EAE6EEE%40treenet.co.nz%3E
Re: [MERGE] Bug 2252: Build failure on Mac OSX 10.5
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 + +++ src/ACLBrowser.cc 2008-03-12 01:10:46 + @@ -41,11 +41,7 @@ /* explicit template instantiation required for some systems */ -template class ACLStrategisedchar const * - -; template class ACLRequestHeaderStrategyHDR_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 -- GPG key available at: http://www.robertcollins.net/keys.txt. signature.asc Description: This is a digitally signed message part
