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 | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tao/Sequence_T.cpp | |
| parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
| download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tao/Sequence_T.cpp')
| -rw-r--r-- | TAO/tao/Sequence_T.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index 6b8f55d3a0f..56db6fafa38 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -542,12 +542,12 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl, template <class T, class T_var> void TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target, - CORBA_Object* src, - CORBA_Environment &ACE_TRY_ENV) + CORBA_Object* src + TAO_ENV_ARG_DECL) { T **tmp = ACE_static_cast (T**, target); - *tmp = T_var::tao_narrow (src, ACE_TRY_ENV); + *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -711,12 +711,12 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl, template <class T, class T_var, size_t MAX> void TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target, - CORBA_Object* src, - CORBA_Environment &ACE_TRY_ENV) + CORBA_Object* src + TAO_ENV_ARG_DECL) { T **tmp = ACE_static_cast (T**, target); - *tmp = T_var::tao_narrow (src, ACE_TRY_ENV); + *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1057,8 +1057,8 @@ TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (CORBA::ULong nelems) { T *buf = 0; - ACE_NEW_RETURN (buf, - T[nelems], + ACE_NEW_RETURN (buf, + T[nelems], 0); return buf; @@ -1223,8 +1223,8 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (CORBA::ULong) { T *buf = 0; - ACE_NEW_RETURN (buf, - T[MAX], + ACE_NEW_RETURN (buf, + T[MAX], 0); return buf; |