ChangeLogTag: Sat Jul 26 10:02:43 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 27 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9df1d03ac6e..0196f425718 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Sat Jul 26 10:02:43 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i:
+
+          Again changed the order of base class constructor calls in the
+          copy constructor for implementations of 3 FT policy interfaces,
+          to eliminate warnings from gcc 3.3. The order now is not
+          depth-first left-to-right, but perhaps the fact that the
+          implementation classes don't use virtual inheritance has an
+          effect on the rule gcc applies.
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h:
+
+          Cosmetic changes.
+
 Fri Jul 25 22:17:44 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 48da2cd7123..0b1b93f1866 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -42,9 +42,9 @@
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_Export TAO_FT_Request_Duration_Policy:
-  public FT::RequestDurationPolicy,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_Export TAO_FT_Request_Duration_Policy 
+  : public FT::RequestDurationPolicy,
+    public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -95,9 +95,9 @@ private:
  * If this  policy is set, it enables the client ORB to send
  * heartbeats to the server ORB over the open connections.
  */
-class TAO_FT_Export TAO_FT_Heart_Beat_Policy:
-  public FT::HeartbeatPolicy,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_Export TAO_FT_Heart_Beat_Policy
+  : public FT::HeartbeatPolicy,
+    public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -159,9 +159,9 @@ private:
  * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of
  * the IOR that it exposes
  */
-class TAO_FT_Export TAO_FT_Heart_Beat_Enabled_Policy:
-  public FT::HeartbeatEnabledPolicy,
-  public TAO_Local_RefCounted_Object
+class TAO_FT_Export TAO_FT_Heart_Beat_Enabled_Policy
+  : public FT::HeartbeatEnabledPolicy,
+    public TAO_Local_RefCounted_Object
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
index d3154b12a49..4caf44a0faf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
@@ -13,8 +13,8 @@ TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
   )
   : ACE_NESTED_CLASS (CORBA, Object) (),
     ACE_NESTED_CLASS (CORBA, Policy) (),
-    FT::RequestDurationPolicy (),
     ACE_NESTED_CLASS (CORBA, LocalObject) (),
+    FT::RequestDurationPolicy (),
     TAO_Local_RefCounted_Object (),
     request_duration_ (rhs.request_duration_)
 {
@@ -38,8 +38,8 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
   )
   : ACE_NESTED_CLASS (CORBA, Object) (),
     ACE_NESTED_CLASS (CORBA, Policy) (),
-    FT::HeartbeatPolicy (),
     ACE_NESTED_CLASS (CORBA, LocalObject) (),
+    FT::HeartbeatPolicy (),
     TAO_Local_RefCounted_Object (),
     heartbeat_ (rhs.heartbeat_),
     heartbeat_interval_ (rhs.heartbeat_interval_),
@@ -62,8 +62,8 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   )
   : ACE_NESTED_CLASS (CORBA, Object) (),
     ACE_NESTED_CLASS (CORBA, Policy) (),
-    FT::HeartbeatEnabledPolicy (),
     ACE_NESTED_CLASS (CORBA, LocalObject) (),
+    FT::HeartbeatEnabledPolicy (),
     TAO_Local_RefCounted_Object (),
     heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {