diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-25 13:28:59 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-25 13:28:59 +0000 |
| commit | 7265616c95fb86ae84147357a5395a327c50f99f (patch) | |
| tree | ecd69b51a1a0651d5ee7b945ce984f1e379e788b /TAO | |
| parent | 6d5282e851b49ded915a221cd79f590ca2120a3c (diff) | |
| download | ATCD-7265616c95fb86ae84147357a5395a327c50f99f.tar.gz | |
(TAO_THROW_ENV,TAO_THROW_ENV_RETURN): with native exceptions, added
ACE_UNUSED_ARG (ENV).
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/tao/try_macros.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h index 4df4cd77af4..c1a25fb26a8 100644 --- a/TAO/tao/try_macros.h +++ b/TAO/tao/try_macros.h @@ -87,14 +87,15 @@ #define TAO_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION #define TAO_THROW(EXCEPTION) throw EXCEPTION -#define TAO_THROW_ENV(EXCEPTION, ENV) throw EXCEPTION +#define TAO_THROW_ENV(EXCEPTION, ENV) do { \ + ACE_UNUSED_ARG (ENV); \ + throw EXCEPTION; } while (0) #define TAO_RETHROW throw #define TAO_GOTO(LABEL) goto LABEL #define TAO_LABEL(LABEL) LABEL: #if defined (ACE_WIN32) - // MSVC++ gives a warning if there is no return after the throw // expression, it is possible that other compilers have the same // problem. @@ -108,7 +109,10 @@ #else -#define TAO_THROW_ENV_RETURN(EXCEPTION, ENV, RETURN) throw EXCEPTION +#define TAO_THROW_ENV_RETURN(EXCEPTION, ENV, RETURN) do { \ + ACE_UNUSED_ARG (ENV); \ + throw EXCEPTION; } while (0) + #define TAO_RETHROW_RETURN(RETURN) throw #define TAO_RETHROW_RETURN_VOID throw |