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 6de739420268051bdd700617e8c1200104fdfcf7..716caed055ed2686017f9f38bad3ccc30be116f2 100644 (file)
--- 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 33f644ab9775de011099b032508ca2551bb9149c..899c348783fb7260af18d3b4d5ec753a411fc0c3 100644 (file)
--- 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 32b58da232319f748d6de1ba17ee2425e6792fee..b1f3ea07af5ccbf423b6e5bd1d6db8dfed5f12e7 100644 (file)
--- 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);
 };