ChangeLogTag:Wed May 12 20:09:16 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

4 files changed, 32 insertions, 27 deletions

diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index eae8a3fe31e..9bd550fdc91 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -230,20 +230,20 @@ void
 Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC (())
 {
-  CORBA::ULong session_count =
+  const CORBA::ULong session_count =
     this->other_sessions_.length ();
   for (CORBA::ULong j = 0; j != session_count; ++j)
     {
       ACE_TRY
         {
-#if (TAO_HAS_MESSAGING == 1)
+#if (TAO_HAS_CORBA_MESSAGING == 1)
           CORBA::PolicyList_var unused;
-          this->other_sessions_[j]->_validate_connection(unused
-                                                         ACE_ENV_ARG_PARAMETER);
+          this->other_sessions_[j]->_validate_connection (unused
+                                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 #else
-          (void) this->other_sessions_[j]->_is_a("Not_An_IDL_Type"
-                                                 ACE_ENV_ARG_PARAMETER);
+          (void) this->other_sessions_[j]->_is_a ("Not_An_IDL_Type"
+                                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 #endif /* TAO_HAS_MESSAGING == 1 */
         }
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index dd899be29b7..3457c09156a 100755
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -1,13 +1,14 @@
 // $Id$
 
-#include "tao/ORB.h"
-#include "TestC.h"
-#include <string>
 #include "tao/DynamicInterface/Request.h"
+#include "TestC.h"
+#include "tao/ORB.h"
 #include "ace/Get_Opt.h"
-#include "Hello.h"
+#include <string>
 
-ACE_RCSID(ICMG_Any_Bug, client, "$Id$")
+ACE_RCSID (ICMG_Any_Bug,
+           client,
+           "$Id$")
 
 const char *ior = "file://test.ior";
 
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 4bc77f8c8ec..db16c7a71f2 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -4,23 +4,25 @@
 
 #include "AMI_Manager.h"
 
-ACE_RCSID(LongUpcalls, AMI_Manager, "$Id$")
+ACE_RCSID (LongUpcalls,
+           AMI_Manager,
+           "$Id$")
 
 static void
-validate_connection(Test::Controller_ptr controller
-                    ACE_ENV_ARG_DECL)
+validate_connection (Test::Controller_ptr controller
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   ACE_TRY
     {
-#if (TAO_HAS_MESSAGING == 1)
+#if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::PolicyList_var unused;
-      controller->validate_connection(unused
-                                      ACE_ENV_ARG_PARAMETER);
+      controller->_validate_connection (unused
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
-      controller->_is_a("Not_an_IDL_Type"
-                        ACE_ENV_ARG_PARAMETER);
+      controller->_is_a ("Not_an_IDL_Type"
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
     }
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index d41363e02d9..f32400c0b75 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -4,23 +4,25 @@
 
 #include "Manager.h"
 
-ACE_RCSID(LongUpcalls, Manager, "$Id$")
+ACE_RCSID (LongUpcalls,
+           Manager,
+           "$Id$")
 
 static void
-validate_connection(Test::Controller_ptr controller
-                    ACE_ENV_ARG_DECL)
+validate_connection (Test::Controller_ptr controller
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   ACE_TRY
     {
-#if (TAO_HAS_MESSAGING == 1)
+#if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::PolicyList_var unused;
-      controller->validate_connection(unused
-                                      ACE_ENV_ARG_PARAMETER);
+      controller->_validate_connection (unused
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
-      controller->_is_a("Not_an_IDL_Type"
-                        ACE_ENV_ARG_PARAMETER);
+      controller->_is_a ("Not_an_IDL_Type"
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
     }