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

7 files changed, 69 insertions, 39 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 79793b7c233..fbc3f48a75a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,28 @@
+Wed May 12 20:09:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp:
+	* tests/Connection_Timeout/client.cpp (main):
+
+	  Fixed "use of undefined preprocessor constant" warnings
+	  revealed by compiling with g++'s "-Wundef" preprocessor flag.
+
+	* tests/Big_Twoways/Session.cpp (validate_connections):
+	* tests/LongUpcalls/AMI_Manager.cpp (validate_connection):
+	* tests/LongUpcalls/Manager.cpp (validate_connection):
+
+	  A preprocessor conditional was checking the value of an
+	  incorrect preprocessor constant.  "TAO_HAS_MESSAGING" ->
+	  "TAO_HAS_CORBA_MESSAGING".  Fixes problem where code that used
+	  CORBA::Object::_validate_connection() method was never called.
+
+	* tests/ICMG_Any_Bug/client.cpp:
+
+	  Reordered #include preprocessor directives to force all
+	  necessary non-dependent names to be parsed prior to the
+	  templates that use them (i.e. TAO_Pseudo_{Var,Out}_T).  Fixes
+	  GNU g++ 3.4 compile-time errors.
+
 Wed May 12 09:31:10 2004  Carlos O'Ryan  <coryan@atdesk.com>
 
 	* orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.h:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index c9f9cf455c5..c663d7ad333 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -737,8 +737,8 @@ Cubit_Client::cube_long_sequence (int,
       // gets in the way.
       input[0] = 4;
 
-#if (ACE_HAS_PURIFY == 1)
-      for(int i=1;i<l;i++)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+      for (int i = 1; i < l; i++)
         input[i]=11;
 #endif /* ACE_HAS_PURIFY == 1 */
 
@@ -811,8 +811,8 @@ Cubit_Client::cube_octet_sequence (int,
       // gets in the way.
       input[0] = 4;
 
-#if (ACE_HAS_PURIFY == 1)
-      for(int i=1;i<l;i++)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+      for (int i = 1 ; i < l; i++)
         input[i]=10;
 #endif /* ACE_HAS_PURIFY == 1 */
 
@@ -888,8 +888,8 @@ Cubit_Client::cube_many_sequence (int,
       in.s = 5;
       in.o = 6;
 
-#if (ACE_HAS_PURIFY == 1)
-      for(int i=1;i<l;i++)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+      for(int i=1; i < l; i++)
         {
           Cubit::Many &inb = input[i];
           inb.l=7;
@@ -972,7 +972,7 @@ Cubit_Client::cube_rti_data (int,
 
       for (int j = 0; j < numUpdates; ++j)
         {
-#if (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
           Cubit::RtiObjectUpdateMessageHeader o;
           ACE_OS::memset (&o, 0, sizeof(Cubit::RtiObjectUpdateMessageHeader));
           input.msgs[j].oumh (o);
@@ -995,7 +995,7 @@ Cubit_Client::cube_rti_data (int,
 
           for (int k = 0; k < numAttrs; ++k)
             {
-#if (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
               Cubit::HandleValuePair h;
               ACE_OS::memset (&h, 0, sizeof(Cubit::HandleValuePair));
               oumh.messagePayload[k] = h;
@@ -1643,7 +1643,7 @@ Cubit_Client::run ()
       this->shutdown_server (this->shutdown_
                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       ACE_TRY_EX (SHM)
 	{
 	  this->cubit_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 97030e6ae5e..f861caf7617 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -279,7 +279,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 
   output->length (input.length ());
 
-#if (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       CORBA::Long x = input[i];
@@ -314,7 +314,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 
   output->length (input.length ());
 
-#if (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
   // For Purify, initialize every output since we're looking for
   // accesses to uninitialized memory addresses.  Performance
   // is secondary when compiling for purify.
@@ -347,7 +347,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 
   output->length (input.length ());
 
-#if (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       const Cubit::Many &in = input[i];
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
     }