diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-04 03:36:52 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-04 03:36:52 +0000 |
| commit | f22d093304909515f3c74d2e6b46797c8b46c5a7 (patch) | |
| tree | cc3265864de8d79eaca1950fdfc148a5ebe2b787 | |
| parent | 767e85dc53259876d6a51fd6177abad834906e97 (diff) | |
| download | ATCD-f22d093304909515f3c74d2e6b46797c8b46c5a7.tar.gz | |
Adjustments for transition to the TAO_ENV_ARG macros in TAO
| -rw-r--r-- | ace/CORBA_macros.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h index fe6d46b029c..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,16 +77,12 @@ // ACE_THROW_INT should not be used by the user. # define ACE_THROW_INT(EXCEPTION) \ - do { \ - 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 { \ - throw EXCEPTION; \ - } while (0) + throw EXCEPTION // Throwing an exception when the function reqires a return value. # if defined (WIN32) || defined (__HP_aCC) @@ -98,9 +94,7 @@ } while (0) # else /* WIN32 */ # define ACE_THROW_RETURN(EXCEPTION,RETV) \ - do { \ - throw EXCEPTION; \ - } while (0) + throw EXCEPTION # endif /* WIN32 */ // For compilers with native exceptions, we can simply use |