------------------------------------------------------------
revno: 13796
revision-id: squid3@treenet.co.nz-20150414072032-qphq1wh0zyizb4ra
parent: squid3@treenet.co.nz-20150413055905-ffzl0jkk6ssl3c0b
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2015-04-14 00:20:32 -0700
message:
  Fix rev.13795 ServerName class
  
  MEMPROXY_CLASS operates differently in v3.5 from v4
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150414072032-qphq1wh0zyizb4ra
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: ee92c9f2ccefd8dac8f6d79f5bd418a75faed0da
# timestamp: 2015-04-14 07:35:38 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150413055905-\
#   ffzl0jkk6ssl3c0b
# 
# Begin patch
=== modified file 'src/acl/ServerName.h'
--- src/acl/ServerName.h	2015-04-13 05:59:05 +0000
+++ src/acl/ServerName.h	2015-04-14 07:20:32 +0000
@@ -16,8 +16,8 @@
 #include "acl/Strategised.h"
 
 class ACLServerNameData : public ACLDomainData {
+public:
     MEMPROXY_CLASS(ACLServerNameData);
-public:
     ACLServerNameData() : ACLDomainData() {}
     virtual bool match(const char *);
     virtual ACLData<char const *> *clone() const;
@@ -46,6 +46,8 @@
     ACLServerNameStrategy&operator=(ACLServerNameStrategy const &);
 };
 
+MEMPROXY_CLASS_INLINE(ACLServerNameData);
+
 class ACLServerName
 {