diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2005-06-17 07:53:44 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2005-06-17 07:53:44 +0000 |
| commit | a9b7ed9b0ce03618cf68874adbd56ade7e2f3da9 (patch) | |
| tree | aef044532c0c6dbdd6e812e828019eab44011444 | |
| parent | 27374a1dcc0f0e97a81928a65a4330d6c9aefb2a (diff) | |
| download | ATCD-a9b7ed9b0ce03618cf68874adbd56ade7e2f3da9.tar.gz | |
ChangeLogTag: Fri Jun 17 08:49:09 2005 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index af63382100c..40f7ad092a9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Jun 17 08:49:09 2005 Simon McQueen <sm@prismtech.com> + + * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp: + + Use _retn () instead of out () for the return value from + _get_component (). + This fixes bug #2155. + Thu Jun 16 14:23:08 MST 2005 Trevor Fields <fields_t@ociweb.com> * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: @@ -10,7 +18,7 @@ Thu Jun 16 14:23:08 MST 2005 Trevor Fields <fields_t@ociweb.com> Thu Jun 16 18:54:01 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: - + Added conditional (for HPUX compiler only) code generation of include of ace/SString.h in the stub source file, apparently necessary when the HP compiler has optimize=1. Thanks to diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 720f2842071..3620e2480c5 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -177,9 +177,9 @@ namespace TAO ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval.out ()); + ACE_CHECK_RETURN (_tao_retval._retn ()); - return _tao_retval.out (); + return _tao_retval._retn (); } CORBA::InterfaceDef_ptr |