Index: www/squid/files/patch-src_adaptation_icap_Xaction.cc
===================================================================
--- www/squid/files/patch-src_adaptation_icap_Xaction.cc	(nonexistent)
+++ www/squid/files/patch-src_adaptation_icap_Xaction.cc	(working copy)
@@ -0,0 +1,11 @@
+--- src/adaptation/icap/Xaction.cc.orig	2016-09-06 21:04:51 UTC
++++ src/adaptation/icap/Xaction.cc
+@@ -599,7 +599,7 @@ const char *Adaptation::Icap::Xaction::s
+     buf.append("/", 1);
+     fillDoneStatus(buf);
+ 
+-    buf.Printf(" %s%u]", id.Prefix, id.value);
++    buf.Printf(" %s%u]", id.prefix(), id.value);
+ 
+     buf.terminate();
+ 

Property changes on: www/squid/files/patch-src_adaptation_icap_Xaction.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: www/squid/files/patch-src_base_AsyncJob.cc
===================================================================
--- www/squid/files/patch-src_base_AsyncJob.cc	(nonexistent)
+++ www/squid/files/patch-src_base_AsyncJob.cc	(working copy)
@@ -0,0 +1,11 @@
+--- src/base/AsyncJob.cc.orig	2016-09-06 21:04:51 UTC
++++ src/base/AsyncJob.cc
+@@ -164,7 +164,7 @@ const char *AsyncJob::status() const
+         buf.Printf("Stopped, reason:");
+         buf.Printf("%s",stopReason);
+     }
+-    buf.Printf(" %s%u]", id.Prefix, id.value);
++    buf.Printf(" %s%u]", id.prefix(), id.value);
+     buf.terminate();
+ 
+     return buf.content();

Property changes on: www/squid/files/patch-src_base_AsyncJob.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: www/squid/files/patch-src_base_InstanceId.h
===================================================================
--- www/squid/files/patch-src_base_InstanceId.h	(nonexistent)
+++ www/squid/files/patch-src_base_InstanceId.h	(working copy)
@@ -0,0 +1,55 @@
+--- src/base/InstanceId.h.orig	2016-07-01 11:37:50 UTC
++++ src/base/InstanceId.h
+@@ -25,35 +25,41 @@ class InstanceId
+ public:
+     typedef unsigned int Value; ///< id storage type; \todo: parameterize?
+ 
+-    InstanceId(): value(++Last ? Last : ++Last) {}
++    InstanceId(): value(0) {change();}
+ 
+     operator Value() const { return value; }
+     bool operator ==(const InstanceId &o) const { return value == o.value; }
+     bool operator !=(const InstanceId &o) const { return !(*this == o); }
+-    void change() {value = ++Last ? Last : ++Last;}
++    void change();
+ 
+-    /// prints Prefix followed by ID value; \todo: use HEX for value printing?
++    /// prints class-pecific prefix followed by ID value; \todo: use HEX for value printing?
+     std::ostream &print(std::ostream &os) const;
+ 
++    /// returns the class-pecific prefix
++    const char * const prefix() const;
++
+ public:
+-    static const char *Prefix; ///< Class shorthand string for debugging
+     Value value; ///< instance identifier
+ 
+ private:
+     InstanceId(const InstanceId& right); ///< not implemented; IDs are unique
+     InstanceId& operator=(const InstanceId &right); ///< not implemented
+-
+-private:
+-    static Value Last; ///< the last used ID value
+ };
+ 
+ /// convenience macro to instantiate Class-specific stuff in .cc files
+-#define InstanceIdDefinitions(Class, prefix) \
+-    template<> const char *InstanceId<Class>::Prefix = prefix; \
+-    template<> InstanceId<Class>::Value InstanceId<Class>::Last = 0; \
++#define InstanceIdDefinitions(Class, pfx) \
++    template<> const char * const \
++    InstanceId<Class>::prefix() const { \
++        return pfx; \
++    } \
+     template<> std::ostream & \
+     InstanceId<Class>::print(std::ostream &os) const { \
+-        return os << Prefix << value; \
++        return os << pfx << value; \
++    } \
++    template<> void \
++    InstanceId<Class>::change() { \
++        static InstanceId<Class>::Value Last = 0; \
++        value = ++Last ? Last : ++Last; \
+     }
+ 
+ /// print the id

Property changes on: www/squid/files/patch-src_base_InstanceId.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: www/squid/files/patch-src_ssl_PeerConnector.cc
===================================================================
--- www/squid/files/patch-src_ssl_PeerConnector.cc	(nonexistent)
+++ www/squid/files/patch-src_ssl_PeerConnector.cc	(working copy)
@@ -0,0 +1,11 @@
+--- src/ssl/PeerConnector.cc.orig	2016-07-01 11:37:50 UTC
++++ src/ssl/PeerConnector.cc
+@@ -771,7 +771,7 @@ Ssl::PeerConnector::status() const
+     }
+     if (serverConn != NULL)
+         buf.Printf(" FD %d", serverConn->fd);
+-    buf.Printf(" %s%u]", id.Prefix, id.value);
++    buf.Printf(" %s%u]", id.prefix(), id.value);
+     buf.terminate();
+ 
+     return buf.content();

Property changes on: www/squid/files/patch-src_ssl_PeerConnector.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property