diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-28 10:39:21 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-28 10:39:21 +0000 |
| commit | 04c79effaa94429dba5786e01a884d9a15fb831d (patch) | |
| tree | 01b908e63f91a70068dbb8d36632099ce487b03a | |
| parent | dbd341e82fb565c6ee530bc5c3fbc1690a00ad2b (diff) | |
| download | ATCD-04c79effaa94429dba5786e01a884d9a15fb831d.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/Alias_TypeCode.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Any_Basic_Impl.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/TypeCode.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/Alias_TypeCode.cpp b/TAO/tao/Alias_TypeCode.cpp index a3bbca2a658..92f21652439 100644 --- a/TAO/tao/Alias_TypeCode.cpp +++ b/TAO/tao/Alias_TypeCode.cpp @@ -58,7 +58,7 @@ template <typename StringType, class RefCountPolicy> CORBA::Boolean TAO::TypeCode::Alias<StringType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL) const { // The CORBA::TypeCode base class already verified equality of the // base attributes (id and name). Perform an equality comparison of diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp index 67d925024a7..f1de5580dae 100644 --- a/TAO/tao/Any_Basic_Impl.cpp +++ b/TAO/tao/Any_Basic_Impl.cpp @@ -145,7 +145,8 @@ namespace TAO // Get the kind of the type where we are extracting in ie. the // aliased type if there are any. Passing the aliased kind // will not help. - CORBA::TCKind const tck = tc->kind (); + CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; // We don't want the rd_ptr of unk to move, in case it is // shared by another Any. This copies the state, not the buffer. diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h index 8c5ac73e13e..dba8097dc40 100644 --- a/TAO/tao/TypeCode.h +++ b/TAO/tao/TypeCode.h @@ -406,7 +406,7 @@ namespace CORBA virtual void tao_release (void) = 0; /// Destruction callback for Anys. - static void CORBA::TypeCode::_tao_any_destructor (void * x); + static void _tao_any_destructor (void * x); typedef CORBA::TypeCode_var _var_type; |