summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableInterceptorC.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableInterceptorC.cpp')
-rw-r--r--TAO/tao/PortableInterceptorC.cpp362
1 files changed, 181 insertions, 181 deletions
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 94d43157e06..ab231eaf9fe 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -81,7 +81,7 @@ PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Inte
return this->ptr_;
}
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
{
return this->ptr_;
}
@@ -141,11 +141,11 @@ PortableInterceptor::Interceptor_var::tao_nil (void)
::PortableInterceptor::Interceptor_ptr
PortableInterceptor::Interceptor_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -225,16 +225,16 @@ PortableInterceptor::Interceptor::~Interceptor (void)
{}
PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return Interceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return Interceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -338,8 +338,8 @@ void PortableInterceptor::ForwardRequest::_raise ()
}
void PortableInterceptor::ForwardRequest::_tao_encode (
- TAO_OutputCDR &cdr,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_OutputCDR &cdr
+ TAO_ENV_ARG_DECL
) const
{
if (cdr << *this)
@@ -351,8 +351,8 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
}
void PortableInterceptor::ForwardRequest::_tao_decode (
- TAO_InputCDR &cdr,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_InputCDR &cdr
+ TAO_ENV_ARG_DECL
)
{
if (cdr >> *this)
@@ -385,45 +385,45 @@ static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
43,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x466f7277),
- ACE_NTOHL (0x61726452),
- ACE_NTOHL (0x65717565),
- ACE_NTOHL (0x73743a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x466f7277),
+ ACE_NTOHL (0x61726452),
+ ACE_NTOHL (0x65717565),
+ ACE_NTOHL (0x73743a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
15,
- ACE_NTOHL (0x466f7277),
- ACE_NTOHL (0x61726452),
- ACE_NTOHL (0x65717565),
+ ACE_NTOHL (0x466f7277),
+ ACE_NTOHL (0x61726452),
+ ACE_NTOHL (0x65717565),
ACE_NTOHL (0x73740000), // name = ForwardRequest
2, // member count
8,
- ACE_NTOHL (0x666f7277),
+ ACE_NTOHL (0x666f7277),
ACE_NTOHL (0x61726400), // name = forward
CORBA::tk_objref,
52, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
29,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4f62),
- ACE_NTOHL (0x6a656374),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4f62),
+ ACE_NTOHL (0x6a656374),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0
7,
- ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x4f626a65),
ACE_NTOHL (0x63740000), // name = Object
10,
- ACE_NTOHL (0x7065726d),
- ACE_NTOHL (0x616e656e),
+ ACE_NTOHL (0x7065726d),
+ ACE_NTOHL (0x616e656e),
ACE_NTOHL (0x74000000), // name = permanent
CORBA::tk_boolean,
@@ -452,19 +452,19 @@ static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x5265706c),
- ACE_NTOHL (0x79537461),
- ACE_NTOHL (0x7475733a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x5265706c),
+ ACE_NTOHL (0x79537461),
+ ACE_NTOHL (0x7475733a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
12,
- ACE_NTOHL (0x5265706c),
- ACE_NTOHL (0x79537461),
+ ACE_NTOHL (0x5265706c),
+ ACE_NTOHL (0x79537461),
ACE_NTOHL (0x74757300), // name = ReplyStatus
CORBA::tk_short,
@@ -511,17 +511,17 @@ static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x536c6f74),
- ACE_NTOHL (0x49643a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x536c6f74),
+ ACE_NTOHL (0x49643a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableInterceptor/SlotId:1.0
7,
- ACE_NTOHL (0x536c6f74),
+ ACE_NTOHL (0x536c6f74),
ACE_NTOHL (0x49640000), // name = SlotId
CORBA::tk_ulong,
@@ -591,8 +591,8 @@ void PortableInterceptor::InvalidSlot::_raise ()
}
void PortableInterceptor::InvalidSlot::_tao_encode (
- TAO_OutputCDR &cdr,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_OutputCDR &cdr
+ TAO_ENV_ARG_DECL
) const
{
if (cdr << *this)
@@ -604,8 +604,8 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
}
void PortableInterceptor::InvalidSlot::_tao_decode (
- TAO_InputCDR &cdr,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_InputCDR &cdr
+ TAO_ENV_ARG_DECL
)
{
if (cdr >> *this)
@@ -628,19 +628,19 @@ static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x496e7661),
- ACE_NTOHL (0x6c696453),
- ACE_NTOHL (0x6c6f743a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x496e7661),
+ ACE_NTOHL (0x6c696453),
+ ACE_NTOHL (0x6c6f743a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
12,
- ACE_NTOHL (0x496e7661),
- ACE_NTOHL (0x6c696453),
+ ACE_NTOHL (0x496e7661),
+ ACE_NTOHL (0x6c696453),
ACE_NTOHL (0x6c6f7400), // name = InvalidSlot
0, // member count
};
@@ -714,7 +714,7 @@ PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_
return this->ptr_;
}
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
{
return this->ptr_;
}
@@ -774,11 +774,11 @@ PortableInterceptor::Current_var::tao_nil (void)
::PortableInterceptor::Current_ptr
PortableInterceptor::Current_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -858,16 +858,16 @@ PortableInterceptor::Current::~Current (void)
{}
PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return Current::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::Current_ptr PortableInterceptor::Current::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -979,7 +979,7 @@ PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::Requ
return this->ptr_;
}
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
{
return this->ptr_;
}
@@ -1039,11 +1039,11 @@ PortableInterceptor::RequestInfo_var::tao_nil (void)
::PortableInterceptor::RequestInfo_ptr
PortableInterceptor::RequestInfo_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -1123,16 +1123,16 @@ PortableInterceptor::RequestInfo::~RequestInfo (void)
{}
PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return RequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return RequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -1232,7 +1232,7 @@ PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor
return this->ptr_;
}
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
{
return this->ptr_;
}
@@ -1292,11 +1292,11 @@ PortableInterceptor::ClientRequestInfo_var::tao_nil (void)
::PortableInterceptor::ClientRequestInfo_ptr
PortableInterceptor::ClientRequestInfo_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -1376,16 +1376,16 @@ PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
{}
PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return ClientRequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return ClientRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -1497,7 +1497,7 @@ PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor
return this->ptr_;
}
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
{
return this->ptr_;
}
@@ -1557,11 +1557,11 @@ PortableInterceptor::ServerRequestInfo_var::tao_nil (void)
::PortableInterceptor::ServerRequestInfo_ptr
PortableInterceptor::ServerRequestInfo_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -1641,16 +1641,16 @@ PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
{}
PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return ServerRequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return ServerRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -1762,7 +1762,7 @@ PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInte
return this->ptr_;
}
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
{
return this->ptr_;
}
@@ -1822,11 +1822,11 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_nil (void)
::PortableInterceptor::ClientRequestInterceptor_ptr
PortableInterceptor::ClientRequestInterceptor_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -1906,16 +1906,16 @@ PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
{}
PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return ClientRequestInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return ClientRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -2027,7 +2027,7 @@ PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInte
return this->ptr_;
}
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
{
return this->ptr_;
}
@@ -2087,11 +2087,11 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_nil (void)
::PortableInterceptor::ServerRequestInterceptor_ptr
PortableInterceptor::ServerRequestInterceptor_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -2171,16 +2171,16 @@ PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
{}
PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return ServerRequestInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return ServerRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -2292,7 +2292,7 @@ PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_
return this->ptr_;
}
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
{
return this->ptr_;
}
@@ -2352,11 +2352,11 @@ PortableInterceptor::IORInfo_var::tao_nil (void)
::PortableInterceptor::IORInfo_ptr
PortableInterceptor::IORInfo_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -2436,16 +2436,16 @@ PortableInterceptor::IORInfo::~IORInfo (void)
{}
PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return IORInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return IORInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -2545,7 +2545,7 @@ PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::I
return this->ptr_;
}
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
{
return this->ptr_;
}
@@ -2605,11 +2605,11 @@ PortableInterceptor::IORInterceptor_var::tao_nil (void)
::PortableInterceptor::IORInterceptor_ptr
PortableInterceptor::IORInterceptor_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -2689,16 +2689,16 @@ PortableInterceptor::IORInterceptor::~IORInterceptor (void)
{}
PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return IORInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return IORInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -2810,7 +2810,7 @@ PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::Po
return this->ptr_;
}
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
{
return this->ptr_;
}
@@ -2870,11 +2870,11 @@ PortableInterceptor::PolicyFactory_var::tao_nil (void)
::PortableInterceptor::PolicyFactory_ptr
PortableInterceptor::PolicyFactory_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -2954,16 +2954,16 @@ PortableInterceptor::PolicyFactory::~PolicyFactory (void)
{}
PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return PolicyFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return PolicyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -3063,7 +3063,7 @@ PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBI
return this->ptr_;
}
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
{
return this->ptr_;
}
@@ -3123,11 +3123,11 @@ PortableInterceptor::ORBInitInfo_var::tao_nil (void)
::PortableInterceptor::ORBInitInfo_ptr
PortableInterceptor::ORBInitInfo_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -3207,16 +3207,16 @@ PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
{}
PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return ORBInitInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -3312,16 +3312,16 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_raise ()
}
void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
- TAO_OutputCDR &,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_OutputCDR &
+ TAO_ENV_ARG_DECL
) const
{
ACE_THROW (CORBA::MARSHAL ());
}
void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
- TAO_InputCDR &,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_InputCDR &
+ TAO_ENV_ARG_DECL
)
{
ACE_THROW (CORBA::MARSHAL ());
@@ -3388,16 +3388,16 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_raise ()
}
void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
- TAO_OutputCDR &,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_OutputCDR &
+ TAO_ENV_ARG_DECL
) const
{
ACE_THROW (CORBA::MARSHAL ());
}
void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
- TAO_InputCDR &,
- CORBA::Environment &ACE_TRY_ENV
+ TAO_InputCDR &
+ TAO_ENV_ARG_DECL
)
{
ACE_THROW (CORBA::MARSHAL ());
@@ -3462,7 +3462,7 @@ PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::O
return this->ptr_;
}
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
{
return this->ptr_;
}
@@ -3522,11 +3522,11 @@ PortableInterceptor::ORBInitializer_var::tao_nil (void)
::PortableInterceptor::ORBInitializer_ptr
PortableInterceptor::ORBInitializer_var::tao_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object *p
+ TAO_ENV_ARG_DECL
)
{
- return ::PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV);
+ return ::PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER);
}
CORBA::Object *
@@ -3606,16 +3606,16 @@ PortableInterceptor::ORBInitializer::~ORBInitializer (void)
{}
PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL
)
{
- return ORBInitializer::_unchecked_narrow (obj, ACE_TRY_ENV);
+ return ORBInitializer::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
}
PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
+ CORBA::Object_ptr obj
+ TAO_ENV_ARG_DECL_NOT_USED
)
{
if (CORBA::is_nil (obj))
@@ -3711,7 +3711,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
{
CORBA::TypeCode_var type = _tao_any.type ();
CORBA::Boolean result =
- type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV);
+ type->equivalent (PortableInterceptor::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (!result)
@@ -3803,7 +3803,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
{
CORBA::TypeCode_var type = _tao_any.type ();
CORBA::Boolean result =
- type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV);
+ type->equivalent (PortableInterceptor::_tc_InvalidSlot TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (!result)