Merged corba-env-clean branch.

1 files changed, 4 insertions, 14 deletions

diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index cee5b5bbdaf..494a0311384 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -67,7 +67,7 @@
 
 #if defined (ACE_CORBA_HAS_EXCEPTIONS)
 // -----------------------------------------------------------------
-# define ACE_ADOPT_CORBA_ENV(ENV) ACE_UNUSED_ARG(ENV)
+# define ACE_ADOPT_CORBA_ENV(ENV)
 
 // No need to check.  Native exceptions handle the control
 // flow automatically when an exception occurs.
@@ -77,34 +77,24 @@
 
 // ACE_THROW_INT should not be used by the user.
 # define ACE_THROW_INT(EXCEPTION) \
-    do { \
-      ACE_UNUSED_ARG(ACE_TRY_ENV); \
-      throw EXCEPTION; \
-    } while (0)
+      throw EXCEPTION
 
 // Throwing an exception is easy. These two macros should _NOT_ be
 // used within try blocks.
 # define ACE_THROW(EXCEPTION) \
-    do { \
-      ACE_UNUSED_ARG(ACE_TRY_ENV); \
-      throw EXCEPTION; \
-    } while (0)
+      throw EXCEPTION
 
 // Throwing an exception when the function reqires a return value.
 # if defined (WIN32) || defined (__HP_aCC)
 #   define ACE_THROW_RETURN(EXCEPTION, RETV) \
       do \
         { \
-          ACE_UNUSED_ARG(ACE_TRY_ENV); \
           throw EXCEPTION; \
           return RETV; \
         } while (0)
 # else /* WIN32 */
 #   define ACE_THROW_RETURN(EXCEPTION,RETV) \
-      do { \
-        ACE_UNUSED_ARG(ACE_TRY_ENV); \
-        throw EXCEPTION; \
-      } while (0)
+        throw EXCEPTION
 # endif /* WIN32 */
 
 // For compilers with native exceptions, we can simply use