ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

1 files changed, 31 insertions, 31 deletions

diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 376ff91f2ed..2fd12da18b4 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1597,10 +1597,10 @@ tao_IOP_Codec_nil (
 IOP::Codec_ptr
 tao_IOP_Codec_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1721,10 +1721,10 @@ IOP::Codec_var::tao_nil (void)
 ::IOP::Codec_ptr
 IOP::Codec_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1806,15 +1806,15 @@ IOP::Codec::~Codec (void)
 
 IOP::Codec_ptr IOP::Codec::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Codec::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::Codec_ptr IOP::Codec::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1909,7 +1909,7 @@ void IOP::Codec::InvalidTypeForEncoding::_raise ()
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1917,7 +1917,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1977,7 +1977,7 @@ void IOP::Codec::FormatMismatch::_raise ()
 
 void IOP::Codec::FormatMismatch::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1985,7 +1985,7 @@ void IOP::Codec::FormatMismatch::_tao_encode (
 
 void IOP::Codec::FormatMismatch::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2045,7 +2045,7 @@ void IOP::Codec::TypeMismatch::_raise ()
 
 void IOP::Codec::TypeMismatch::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2053,7 +2053,7 @@ void IOP::Codec::TypeMismatch::_tao_encode (
 
 void IOP::Codec::TypeMismatch::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2211,10 +2211,10 @@ tao_IOP_CodecFactory_nil (
 IOP::CodecFactory_ptr
 tao_IOP_CodecFactory_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2337,10 +2337,10 @@ IOP::CodecFactory_var::tao_nil (void)
 ::IOP::CodecFactory_ptr
 IOP::CodecFactory_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2422,15 +2422,15 @@ IOP::CodecFactory::~CodecFactory (void)
 
 IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CodecFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2525,7 +2525,7 @@ void IOP::CodecFactory::UnknownEncoding::_raise ()
 
 void IOP::CodecFactory::UnknownEncoding::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2533,7 +2533,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_encode (
 
 void IOP::CodecFactory::UnknownEncoding::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2584,7 +2584,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2667,7 +2667,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2750,7 +2750,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2841,7 +2841,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2932,7 +2932,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3023,7 +3023,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3106,7 +3106,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3197,7 +3197,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3287,7 +3287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)