Moved ORB_var member up the list.

3 files changed, 8 insertions, 7 deletions

diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index b0ddfdec286..2b4d0df9654 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -72,12 +72,12 @@ private:
   int shutdown_;
   // Flag to tell server to shutdown.
 
-  MT_Object_var mT_Object_var_;
-  // pointer to the mt Object
-
   CORBA::ORB_var orb_var_;
   // Remember our orb.
 
+  MT_Object_var mT_Object_var_;
+  // pointer to the mt Object
+
   int client_number_;
   // This is used to choose the server...
 
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 1df042f2caf..42b1289a9e4 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -56,8 +56,8 @@ Coffee_i::description (const Coffee::Desc &description,
 
 Param_Test_i::Param_Test_i (const char *coffee_name,
                             CORBA::ORB_ptr orb)
-  : obj_ (coffee_name),
-    orb_ (CORBA::ORB::_duplicate (orb))
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    obj_ (coffee_name)
 {
 }
 
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 7095a182d41..ee7ff1582b4 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -260,14 +260,15 @@ public:
 
 
 private:
+  CORBA::ORB_var orb_;
+  // Remember out ORB.
+
   Coffee_i obj_;
   // the coffee object reference we maintain
 
   int test_exception_count_;
   // Count the number of calls to test_exception() so we can throw
   // every 3 calls or so.
-
-  CORBA::ORB_var orb_;
 };
 
 #endif /* PARAM_TEST_I_H */