------------------------------------------------------------ revno: 12234 revision-id: henrik@henriknordstrom.net-20120727230209-wg662ywlf6das286 parent: chtsanti@users.sourceforge.net-20120726173658-i7gb9j2ednunlcts committer: Henrik Nordstrom branch nick: trunk timestamp: Sat 2012-07-28 01:02:09 +0200 message: Adjust for GCC-4.7 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: henrik@henriknordstrom.net-20120727230209-\ # wg662ywlf6das286 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 93950973919b5b94930e6f3012a92bae84bdc0bb # timestamp: 2012-07-27 23:52:20 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: chtsanti@users.sourceforge.net-20120726173658-\ # i7gb9j2ednunlcts # # Begin patch === modified file 'src/ssl/gadgets.h' --- src/ssl/gadgets.h 2012-07-19 00:12:22 +0000 +++ src/ssl/gadgets.h 2012-07-27 23:02:09 +0000 @@ -41,7 +41,7 @@ void resetAndLock(T *t) { if (t != this->get()) { - reset(t); + this->reset(t); if (t) CRYPTO_add(&t->references, 1, lock); }