ChangeLogTag: Tue Mar 27 23:00:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>

4 files changed, 25 insertions, 41 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0d79ed0239f..e9d0581586a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Tue Mar 27 23:00:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
+
+        * tests/AMI/client.cpp:
+        * tests/AMI/simple_client.cpp:
+        * tests/AMI/ami_test_i.cpp:
+          Fixed ACE_TRY_ENV/ACE_TRY_CHECK Fuzz test warnings.
+
 Tue Mar 27 19:37:58 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * rules.tao.GNU:
@@ -113,6 +120,7 @@ Tue Mar 27 14:20:48 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
           all the occurences of TAO_orbdebug to TAO_debug_level. That
           should hopefully fix the DLL Core builds.
 
+>>>>>>> 1.2970
 Tue Mar 27 08:15:34 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp:
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index d6b16db28f0..b6fdee8113d 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -58,20 +58,17 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 
 void
-AMI_Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+AMI_Test_i::shutdown (CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   this->orb_->shutdown (0);
 }
 
 
 CORBA::Long
-AMI_Test_i::yadda (CORBA::Environment &ACE_TRY_ENV)
+AMI_Test_i::yadda (CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  //  if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n"));
   return yadda_;
@@ -80,11 +77,9 @@ AMI_Test_i::yadda (CORBA::Environment &ACE_TRY_ENV)
 
 void
 AMI_Test_i::yadda (CORBA::Long yadda,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  //  if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
               "%N:%l:(%P:%t):AMI_Test_i::(set_)yadda\n"));
   yadda_ = yadda;
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index e42406be66c..f760efb0f2a 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -135,41 +135,34 @@ public:
       ACE_CHECK;
     };
 
-  void get_yadda (CORBA::Long result,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void get_yadda (CORBA::Long,
+                  CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (result);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda> called: result <%d>\n",
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder * excep_holder,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
+                        CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (excep_holder);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (CORBA::Environment &ACE_TRY_ENV)
+  void set_yadda (CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder * excep_holder,
-                        CORBA::Environment &ACE_TRY_ENV)
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
+                        CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (excep_holder);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called: \n"));
     };
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 72b610afd4d..f6e69bd445e 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -83,12 +83,9 @@ public:
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l,
-            CORBA::Environment &ACE_TRY_ENV)
+            CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (ami_return_val);
-      ACE_UNUSED_ARG (out_l);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       if (debug)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -127,42 +124,33 @@ public:
 
 
   void get_yadda (CORBA::Long result,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (result);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda> called: result <%d>\n",
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder * excep_holder,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
+                  CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (excep_holder);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (CORBA::Environment &ACE_TRY_ENV)
+  void set_yadda (CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder * excep_holder,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
+                  CORBA::Environment &)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_UNUSED_ARG (excep_holder);
-      ACE_UNUSED_ARG (ACE_TRY_ENV);
-
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda_excep> called: \n"));
     };