diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-12 19:58:05 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-12 19:58:05 +0000 |
| commit | ec2de516d6feaf73b177042cafb0979799865b38 (patch) | |
| tree | 27b6d7c98e52c6d0222bef579d91cfc3139214c0 | |
| parent | 04f1220fc51db31cd91949a2fc41d4e1fe09b1b8 (diff) | |
| download | ATCD-ec2de516d6feaf73b177042cafb0979799865b38.tar.gz | |
Made the native exception macros fit on one line so compilers don't get
confused by the "try" on its own line.
| -rw-r--r-- | TAO/tao/try_macros.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h index ae140f390cb..f25a626350d 100644 --- a/TAO/tao/try_macros.h +++ b/TAO/tao/try_macros.h @@ -35,22 +35,14 @@ #define TAO_TRY_ENV __env // The first "do" scope is for the env. // The second "do" scope is for the TAO_CHECK_ENV continues. -#define TAO_TRY \ -do { \ -CORBA_Environment TAO_TRY_ENV; \ -try { +// These are all on one line so the keywords don't confuse compilers. +#define TAO_TRY do { CORBA_Environment TAO_TRY_ENV; try { -#define TAO_TRY_EX(LABEL) \ -do { \ -CORBA_Environment TAO_TRY_ENV; \ -try { +#define TAO_TRY_EX(LABEL) do { CORBA_Environment TAO_TRY_ENV; try { -#define TAO_CATCH(TYPE,VAR) \ -} catch (TYPE & VAR) { \ -ACE_UNUSED_ARG (VAR); +#define TAO_CATCH(TYPE,VAR) } catch (TYPE & VAR) { ACE_UNUSED_ARG (VAR); -#define TAO_CATCHANY \ -} catch (...) { +#define TAO_CATCHANY } catch (...) { #define TAO_ENDTRY }} while (0) // Use this macro if there's a return statement following TAO_ENDTRY |