------------------------------------------------------------ revno: 13732 revision-id: squid3@treenet.co.nz-20150119172843-23yom739795wqifw parent: squid3@treenet.co.nz-20150119135409-3dhld0h2m5t7pmoj committer: Amos Jeffries branch nick: 3.5 timestamp: Mon 2015-01-19 09:28:43 -0800 message: Portability: Remove C++11-isms in ACLs FreeBSD 10 clang complains about these. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150119172843-23yom739795wqifw # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 26baa94b4371abc0a83fdb41423cfd32a85803b2 # timestamp: 2015-01-19 17:51:02 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150119135409-\ # 3dhld0h2m5t7pmoj # # Begin patch === modified file 'src/acl/Arp.cc' --- src/acl/Arp.cc 2015-01-19 13:54:09 +0000 +++ src/acl/Arp.cc 2015-01-19 17:28:43 +0000 @@ -130,7 +130,7 @@ ACLARP::dump() const { SBufList sl; - for (auto i = aclArpData.cbegin(); i != aclArpData.cend(); ++i) { + for (AclArpData_t::iterator i = aclArpData.begin(); i != aclArpData.end(); ++i) { char buf[48]; i->encode(buf,48); sl.push_back(SBuf(buf)); === modified file 'src/acl/Eui64.cc' --- src/acl/Eui64.cc 2015-01-19 13:54:09 +0000 +++ src/acl/Eui64.cc 2015-01-19 17:28:43 +0000 @@ -108,7 +108,7 @@ ACLEui64::dump() const { SBufList sl; - for (auto i = eui64Data.cbegin(); i != eui64Data.end(); ++i) { + for (Eui64Data_t::iterator i = eui64Data.begin(); i != eui64Data.end(); ++i) { static char buf[48]; i->encode(buf,48); sl.push_back(SBuf(buf));