diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tao/Object.i | |
| parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
| download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tao/Object.i')
| -rw-r--r-- | TAO/tao/Object.i | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index b2376125f61..3e5d8b7b77b 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -75,7 +75,7 @@ CORBA_Object::_nil (void) } ACE_INLINE CORBA_Object_ptr -CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment &) +CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return CORBA::Object::_nil (); @@ -91,9 +91,9 @@ CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment &) } ACE_INLINE CORBA_Object_ptr -CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment &ACE_TRY_ENV) +CORBA_Object::_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL) { - return CORBA_Object::_unchecked_narrow (obj, ACE_TRY_ENV); + return CORBA_Object::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } ACE_INLINE TAO_Stub * @@ -220,8 +220,8 @@ CORBA_Object_var::tao_nil (void) ACE_INLINE CORBA_Object_ptr CORBA_Object_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment & + CORBA::Object *p + TAO_ENV_ARG_DECL_NOT_USED ) { return CORBA_Object::_duplicate (p); |