------------------------------------------------------------ revno: 13753 revision-id: squid3@treenet.co.nz-20150214223706-1m7c9n0k15esuqzy parent: squid3@treenet.co.nz-20150210045421-fc4c6n3vk9u87wyf committer: Amos Jeffries branch nick: 3.5 timestamp: Sat 2015-02-14 14:37:06 -0800 message: Revert C++11-ism from 3.5 branch ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150214223706-1m7c9n0k15esuqzy # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 5b18f3bcb0f6bab909961d7cdfef9faf055f5bf8 # timestamp: 2015-02-14 22:50:55 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150210045421-\ # fc4c6n3vk9u87wyf # # Begin patch === modified file 'src/client_side.cc' --- src/client_side.cc 2015-02-10 04:49:43 +0000 +++ src/client_side.cc 2015-02-14 22:37:06 +0000 @@ -625,7 +625,7 @@ if (request) { // The al->notes and request->notes must point to the same object. (void)SyncNotes(*al, *request); - for (auto i = Config.notes.begin(); i != Config.notes.end(); ++i) { + for (Notes::iterator i = Config.notes.begin(); i != Config.notes.end(); ++i) { if (const char *value = (*i)->match(request, al->reply, NULL)) { NotePairs ¬es = SyncNotes(*al, *request); notes.add((*i)->key.termedBuf(), value);