------------------------------------------------------------ revno: 12275 revision-id: squid3@treenet.co.nz-20120811020403-7boft1209fi00ua4 parent: squidadm@squid-cache.org-20120811001447-g831muec4n0mh2qx committer: Amos Jeffries branch nick: trunk timestamp: Fri 2012-08-10 20:04:03 -0600 message: shuffel MEMPROXY macros for better CacheMgr reporting names ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20120811020403-7boft1209fi00ua4 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: a27de332cab44ff62d4baa62eec9662a1a2be49d # timestamp: 2012-08-11 02:52:55 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squidadm@squid-cache.org-20120811001447-\ # g831muec4n0mh2qx # # Begin patch === modified file 'src/comm/Connection.h' --- src/comm/Connection.h 2011-07-12 05:52:07 +0000 +++ src/comm/Connection.h 2012-08-11 02:04:03 +0000 @@ -163,10 +163,9 @@ peer *_peer; }; -MEMPROXY_CLASS_INLINE(Connection); - }; // namespace Comm +MEMPROXY_CLASS_INLINE(Comm::Connection); // NP: Order and namespace here is very important. // * The second define inlines the first.