From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 1 Jul 2010 22:58:45 +0000 (-0600)
Subject: Moved CBDATA_CLASS2() down because it makes all members declared below public.
X-Git-Tag: SQUID_3_2_0_1~93^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea256cd7100cef750de6e6ca83419d3edbd9601;p=thirdparty%2Fsquid.git

Moved CBDATA_CLASS2() down because it makes all members declared below public.
---

diff --git a/src/ipc/Coordinator.h b/src/ipc/Coordinator.h
index 6de7394202..716caed055 100644
--- a/src/ipc/Coordinator.h
+++ b/src/ipc/Coordinator.h
@@ -53,11 +53,11 @@ private:
 
     static Coordinator* TheInstance; ///< the only class instance in existence
 
-    CBDATA_CLASS2(Coordinator);
-
 private:
     Coordinator(const Coordinator&); // not implemented
     Coordinator& operator =(const Coordinator&); // not implemented
+
+    CBDATA_CLASS2(Coordinator);
 };
 
 
diff --git a/src/ipc/Strand.h b/src/ipc/Strand.h
index 33f644ab97..899c348783 100644
--- a/src/ipc/Strand.h
+++ b/src/ipc/Strand.h
@@ -37,11 +37,11 @@ private:
 private:
     bool isRegistered; ///< whether Coordinator ACKed registration (unused)
 
-    CBDATA_CLASS2(Strand);
-
 private:
     Strand(const Strand&); // not implemented
     Strand& operator =(const Strand&); // not implemented
+
+    CBDATA_CLASS2(Strand);
 };
 
 
diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h
index 32b58da232..b1f3ea07af 100644
--- a/src/ipc/UdsOp.h
+++ b/src/ipc/UdsOp.h
@@ -81,11 +81,11 @@ private:
     int timeout; ///< total time to send the message
     bool writing; ///< whether Comm started and did not finish writing
 
-    CBDATA_CLASS2(UdsSender);
-
 private:
     UdsSender(const UdsSender&); // not implemented
     UdsSender& operator= (const UdsSender&); // not implemented
+
+    CBDATA_CLASS2(UdsSender);
 };