diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-05 17:52:09 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-05 17:52:09 +0000 |
| commit | ca4cb6c60320902130e9a34ba3035cb6f7a9ca00 (patch) | |
| tree | 2601b102f789c8f74679993a87d091e3e2d68456 | |
| parent | 9c6a6497b18cee6134afe12012e1047eea835840 (diff) | |
| download | ATCD-ca4cb6c60320902130e9a34ba3035cb6f7a9ca00.tar.gz | |
ChangeLogTag: Fri Nov 5 11:50:39 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 27 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp | 2 |
2 files changed, 18 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aef4ba66b1b..a6b92fcdeaf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,20 +1,27 @@ +Fri Nov 5 11:50:39 2004 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp: + + Choose .in() on the any instead of the * operator. This will help + Borland get past the ambiguity. + Fri Nov 5 16:14:52 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * tao/DynamicInterface/DII_Arguments.cpp (interceptor_paramlist): + * tao/DynamicInterface/DII_Arguments.cpp (interceptor_paramlist): - Do not insert the argument into any Any. Just call replace () to - make a logical copy of the TAO::Any_impl. + Do not insert the argument into any Any. Just call replace () to + make a logical copy of the TAO::Any_impl. - * tao/PortableServer/Object_Adapter.cpp: - * tao/PortableServer/POA.cpp: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/POA.cpp: - Reorganized the lock strategy which prevents deadlocks with - ImR. Please see + Reorganized the lock strategy which prevents deadlocks with + ImR. Please see - http://groups.yahoo.com/group/tao-users/message/18317 + http://groups.yahoo.com/group/tao-users/message/18317 - for the original bug report and the suggested solution from - Bill Somerville <bill at classdesign dot com>. + for the original bug report and the suggested solution from + Bill Somerville <bill at classdesign dot com>. Fri Nov 5 07:02:01 2004 Chad Elliott <elliott_c@ociweb.com> diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index f7d5bc78d31..ecd22e55564 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -434,7 +434,7 @@ TAO_Log_Constraint_Visitor::visit_component_assoc ( { CORBA::Any *any_ptr = 0; ACE_NEW_RETURN (any_ptr, - CORBA::Any (*any), + CORBA::Any (any.in ()), -1); this->current_member_ = any_ptr; return comp->accept (this); |