diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-08 04:30:51 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-08 04:30:51 +0000 |
| commit | d723e3fb1d077df0ed2955196b108862ff900c6a (patch) | |
| tree | 567fbb877442cd62551808d76a616eefafb210a4 /TAO | |
| parent | 8c72a8c1893d5b5d653257d85720bc1b47fe8407 (diff) | |
| download | ATCD-d723e3fb1d077df0ed2955196b108862ff900c6a.tar.gz | |
ChangeLogTag:Thu Apr 7 21:27:55 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/Fixed_TypeCode.cpp | 2 |
5 files changed, 27 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8860b6ffc98..84ea43f32e7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Thu Apr 7 21:27:55 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp + (is_executed_request): + * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp (value_i): + * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp + (define_property): + * tao/Fixed_TypeCode.cpp (equivalent_i): + + Fixed emulated exception macro usage. + Thu Apr 7 14:20:00 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/RTScheduling/Request_Interceptor.cpp (receive_exception): diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 3247bc06c2a..25779e34e8e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -158,7 +158,9 @@ bool Request_Context_Repository::is_executed_request() CORBA::Any_var any = get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var type = any->type(); - return type->kind() != CORBA::tk_null; + CORBA::TCKind const kind = type->kind(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + return kind != CORBA::tk_null; } ACE_CATCHALL { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 25464717f07..dbcc991a2eb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -255,7 +255,12 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value CORBA::TypeCode_var val_tc = value.type (); - if (!my_tc.in ()->equal (val_tc.in ())) + CORBA::Boolean const equal_tc = + my_tc.in ()->equal (val_tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + if (!equal_tc) { return; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 7774be75c22..af53b29a30a 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -512,8 +512,13 @@ TAO_PropertySet::define_property (const char *property_name, mapped_tc = entry_ptr->int_id_.pvalue_.type (); + CORBA::Boolean const equal_tc = + mapped_tc.in ()->equal (arg_tc.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + // If type is not the same, raise exception. - if (! mapped_tc.in ()->equal (arg_tc.in ())) + if (!equal_tc) ACE_THROW (CosPropertyService::ConflictingProperty()); // If mode is read only, raise exception. diff --git a/TAO/tao/Fixed_TypeCode.cpp b/TAO/tao/Fixed_TypeCode.cpp index 642ff20da8f..dbaa3f0b9d2 100644 --- a/TAO/tao/Fixed_TypeCode.cpp +++ b/TAO/tao/Fixed_TypeCode.cpp @@ -86,7 +86,7 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc // called, we can also call it to determine equivalence of // tk_fixed TypeCodes. return this->equal_i (tc - ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } template <class RefCountPolicy> |