------------------------------------------------------------ revno: 11511 revision-id: squid3@treenet.co.nz-20110620134238-1csru3x295pclm83 parent: squid3@treenet.co.nz-20110620112411-cf4omlem5r2ccgnz committer: Amos Jeffries branch nick: trunk timestamp: Tue 2011-06-21 01:42:38 +1200 message: More compile fixes for revo.11508 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20110620134238-1csru3x295pclm83 # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 480161990f184e9039fa7adf4e409ce003308020 # timestamp: 2011-06-20 13:51:43 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20110620112411-\ # cf4omlem5r2ccgnz # # Begin patch === modified file 'src/AclRegs.cc' --- src/AclRegs.cc 2011-06-20 08:51:32 +0000 +++ src/AclRegs.cc 2011-06-20 13:42:38 +0000 @@ -101,7 +101,7 @@ ACLMaxConnection ACLMaxConnection::RegistryEntry_("maxconn"); ACL::Prototype ACLMethod::RegistryProtoype(&ACLMethod::RegistryEntry_, "method"); ACLStrategised ACLMethod::RegistryEntry_(new ACLMethodData, ACLMethodStrategy::Instance(), "method"); -ACL::Prototype ACLLocatIP::RegistryProtoype(&ACLLocalIP::RegistryEntry_, "localip"); +ACL::Prototype ACLLocalIP::RegistryProtoype(&ACLLocalIP::RegistryEntry_, "localip"); ACLLocalIP ACLLocalIP::RegistryEntry_; ACL::Prototype ACLLocalPort::RegistryProtoype(&ACLLocalPort::RegistryEntry_, "localport"); ACLStrategised ACLLocalPort::RegistryEntry_(new ACLIntRange, ACLLocalPortStrategy::Instance(), "localport"); === modified file 'src/acl/LocalIp.cc' --- src/acl/LocalIp.cc 2011-06-20 08:51:32 +0000 +++ src/acl/LocalIp.cc 2011-06-20 13:42:38 +0000 @@ -55,5 +55,5 @@ ACL * ACLLocalIP::clone() const { - return new ACLocalIP(*this); + return new ACLLocalIP(*this); }