From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 4 Nov 2016 22:05:07 +0000 (-0600)
Subject: Do not hide an already constant SBuf::id or expose its internals.
X-Git-Tag: SQUID_4_0_17~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f39f94d27bdd6fd0e45b3b4245c06f6acb98e6fe;p=thirdparty%2Fsquid.git

Do not hide an already constant SBuf::id or expose its internals.
---

diff --git a/src/sbuf/SBuf.h b/src/sbuf/SBuf.h
index cda0f8bfeb..784d1bff70 100644
--- a/src/sbuf/SBuf.h
+++ b/src/sbuf/SBuf.h
@@ -125,9 +125,6 @@ public:
 
     ~SBuf();
 
-    /// retrieve the SBuf ID number
-    unsigned int getId() const { return id.value; }
-
     /** Explicit assignment.
      *
      * Current SBuf will share backing store with the assigned one.
@@ -613,6 +610,11 @@ public:
 
     // TODO: possibly implement erase() similar to std::string's erase
     // TODO: possibly implement a replace() call
+
+    /// SBuf object identifier meant for test cases and debugging.
+    /// Does not change when object does, including during assignment.
+    const InstanceId<SBuf> id;
+
 private:
 
     /**
@@ -641,9 +643,6 @@ private:
     size_type len_; ///< number of our content bytes in shared store_
     static SBufStats stats; ///< class-wide statistics
 
-    /// SBuf object identifier; does not change when contents do,
-    ///   including during assignment
-    const InstanceId<SBuf> id;
 
     /** obtain prototype store
      *