diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-12 17:24:40 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-12 17:24:40 +0000 |
| commit | 55521160c4232e5d2e63302313ab6831f53e9d31 (patch) | |
| tree | 0e09d8970d254e55fe5714d2c89975f52eec9c7b | |
| parent | bc05b1465c299c9cecef14eef03125c7509616e3 (diff) | |
| download | ATCD-55521160c4232e5d2e63302313ab6831f53e9d31.tar.gz | |
ChangeLogTag: Fri Jan 12 17:23:07 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp | 22 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp | 2 |
3 files changed, 22 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3cb6bde4f68..8847fca070b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Jan 12 17:23:07 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> + + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp: + + Modified call to make_dyn_any_t() to be consistent with + changes in + + Thu Jan 11 18:42:33 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> + Fri Jan 12 09:06:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/DynamicAny/DynAnyUtils_T.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 22ea9a17b82..6c8b55d4d88 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -47,9 +47,9 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRec for (CORBA::Long i = 0; i < len; ++i) { this->property_lookup_.bind (ACE_CString(rec.attr_list[i].name, - 0, - 0), - rec.attr_list[i].value); + 0, + 0), + rec.attr_list[i].value); } } @@ -97,8 +97,8 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) { if (any.impl() != 0) { - this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any)); - return_value = 0; + this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any)); + return_value = 0; } } @@ -209,19 +209,19 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( } DynamicAny::DynAny_var dyn_any = - TAO::MakeDynAnyUtils<const CORBA::Any &>::make_dyn_any_t ( + TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any &> ( disc_tc.in (), disc_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + dyn_union.set_discriminator (dyn_any.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var u_member = dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + this->current_member_ = u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -404,9 +404,9 @@ TAO_Log_Constraint_Visitor::visit_component_assoc ( // the spec may come along someday. CORBA::Any any; - ACE_CString key (assoc->identifier ()->value (), - 0, - 0); + ACE_CString key (assoc->identifier ()->value (), + 0, + 0); if (this->property_lookup_.find (key, any) != 0 || any.impl () == 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index d04426c397a..49f4aa6814e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -270,7 +270,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( } DynamicAny::DynAny_var dyn_any = - TAO::MakeDynAnyUtils<const CORBA::Any &>::make_dyn_any_t ( + TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any &> ( disc_tc.in (), disc_any ACE_ENV_ARG_PARAMETER); |