From 63165b00e2d667e39e15cf084128d94a563d484e Mon Sep 17 00:00:00 2001
From: Ossama Othman <ossama-othman@users.noreply.github.com>
Date: Sat, 8 Dec 2001 21:59:30 +0000
Subject: Merged corba-env-clean branch.

---
 TAO/tao/Object.i | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'TAO/tao/Object.i')

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);
-- 
cgit v1.2.1