ChangeLogTag:Sun Dec 09 22:29:16 2001 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 39 insertions, 23 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 8923d28fd24..7524765ba06 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,14 @@
+Sun Dec 09 22:29:16 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* tao/GIOP_Message_Generator_Parser_10.cpp:
+	* tao/ORB.cpp:
+	* tao/PortableServer/Object_Adapter.cpp:
+	* tests/ORB_init/Portspan/server.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp:
+	  Fixed build warnings due mostly to subtle uses of ACE_TRY_ENV
+	  (or lack thereof)
+
 Sun Dec  9 16:45:06 2001  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/orbsvcs/SecurityLevel2.idl (set_attributes):
@@ -14,7 +25,7 @@ Sun Dec  9 13:50:47 2001  Ossama Othman  <ossama@uci.edu>
 	  This method now accepts the handle that will be closed instead
 	  of relying on calling the get_handle() method.  This a
 	  precautionary measure for avoiding a race condition.
-	
+
 	  (handle_close, handle_input, handle_output):
 
 	  Pass the handle down to the handle_close_i() method instead of
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 7620c20acae..f7e4467928a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -149,8 +149,9 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
 {
   ACE_TRY
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Consumer %x does not exists\n", long(proxy)));
+      //ACE_DEBUG ((LM_DEBUG,
+      //            "EC_Reactive_ConsumerControl(%P|%t) - "
+      //            "Consumer %x does not exists\n", long(proxy)));
       proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 85c83d61ef6..4104bcca997 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -149,8 +149,9 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist (
 {
   ACE_TRY
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Supplier %x does not exists\n", long(proxy)));
+      //ACE_DEBUG ((LM_DEBUG,
+      //            "EC_Reactive_SupplierControl(%P|%t) - "
+      //            "Consumer %x does not exists\n", long(proxy)));
       proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 7c255d90b30..e84337b3e1b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -124,6 +124,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
   // Write the service context list.
 #if (TAO_HAS_MINIMUM_CORBA == 1)
   output << reply.service_context_notowned ();
+  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #else
   if (reply.is_dsi_ == 0)
     {
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index a5dd633a5e9..fed26d0c06c 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1297,10 +1297,8 @@ CORBA::ORB_init (int &argc,
                  const char *orbid,
                  CORBA_Environment &ACE_TRY_ENV)
 {
-  // This ugly ifdef will go away once we've merged the two ORB_init's.
-#if defined (TAO_HAS_EXCEPTIONS) && !defined (TAO_ENV_BKWD_COMPAT)
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-#endif
+  // This ugly macro will go away once we've merged the two ORB_init's.
+  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 
   // Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
   // from being called within a static object CTOR.
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 42fcf3e26a0..cbecd8527c1 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1362,7 +1362,7 @@ void
 TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV)
 {
 #if defined (ACE_HAS_EXCEPTIONS)
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
 #endif
 
   // Check if a non-servant upcall is in progress.  If a non-servant
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index 0244d6e2180..b5ed3f05ca3 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -7,37 +7,41 @@ main( int argc, char *argv[] )
 {
   ACE_TRY_NEW_ENV
     {
-      
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;    
 
-      CORBA::Object_var obj = orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in(), ACE_TRY_ENV);
+
+      CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"
+                                                              TAO_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()
+                                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      PortableServer::POAManager_var man = poa->the_POAManager(ACE_TRY_ENV);
+
+      PortableServer::POAManager_var man = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       man->activate(ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       simple_i simp;
 
-      PortableServer::ObjectId_var objId = poa->activate_object(&simp, ACE_TRY_ENV);
+      PortableServer::ObjectId_var objId = poa->activate_object(&simp
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run(ACE_TRY_ENV);
+      orb->run(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
-  
+
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in main():");
       return 1;
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }