diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-01 22:06:42 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-01 22:06:42 +0000 |
| commit | 7ae07b22392ec4c63fa305981c2f1d3a0330a0c1 (patch) | |
| tree | 32cf88b62df696e8b91ca4a13de87921ccf691cc | |
| parent | a6ab52bca7f38bd2814b8c6618051ea1337fe982 (diff) | |
| download | ATCD-7ae07b22392ec4c63fa305981c2f1d3a0330a0c1.tar.gz | |
Renamed TAO_LACKS_SUPPRESS_ENV to TAO_ENV_BKWD_COMPAT
| -rw-r--r-- | TAO/tao/ORB.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/corbafwd.h | 6 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 5fab013e9b3..c1fb2062efb 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1302,7 +1302,7 @@ CORBA::ORB_init (int &argc, CORBA_Environment &ACE_TRY_ENV) { // This ugly ifdef will go away once we've merged the two ORB_init's. -#if defined (TAO_HAS_EXCEPTIONS) && !defined (TAO_LACKS_SUPPRESS_ENV) +#if defined (TAO_HAS_EXCEPTIONS) && !defined (TAO_ENV_BKWD_COMPAT) ACE_UNUSED_ARG (ACE_TRY_ENV); #endif diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index eea0975098b..76463d072bc 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -608,8 +608,10 @@ typedef u_int CORBA_Flags; typedef void (*TAO_Skeleton)( TAO_ServerRequest &, void *, - void *, - CORBA_Environment &ACE_TRY_ENV + void * +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + , CORBA_Environment & +#endif ); // forward declare sequences. diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 8a88e41f5d2..83487dee5d9 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -225,7 +225,7 @@ # error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them" #endif /* TAO_HAS_EXCEPTIONS */ -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_LACKS_SUPPRESS_ENV) +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) #define TAO_ENV_ARG_DECL , CORBA::Environment &ACE_TRY_ENV #define TAO_ENV_ARG_DECL_WITH_DEFAULTS , CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () #define TAO_ENV_ARG_DECL_NOT_USED , CORBA::Environment & @@ -236,7 +236,7 @@ #define TAO_ENV_SINGLE_ARG_PARAMETER ACE_TRY_ENV #define TAO_ENV_ARG_NOT_USED ACE_UNUSED_ARG (ACE_TRY_ENV) #define TAO_ENV_ARG_DEFN /* Please do not use, obsolescent. Instead: */ -#define TAO_ENV_DECLARE_NEW_ENV ACE_DECLARE_NEW_CORBA_ENV +#define TAO_ENV_DECLARE_NEW_ENV TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS #else #define TAO_ENV_ARG_DECL #define TAO_ENV_ARG_DECL_WITH_DEFAULTS @@ -251,7 +251,7 @@ #define TAO_ENV_DECLARE_NEW_ENV #endif /* TAO_HAS_EXCEPTIONS */ #if !defined (TAO_HAS_EXCEPTIONS) -// This thing can be moved into the above when we drop TAO_LACKS_SUPPRESS_ENV. +// This thing can be moved into the above when we drop TAO_ENV_BKWD_COMPAT. #define TAO_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex) #else #define TAO_ENV_RAISE(ex) (ex)->_raise () |