diff options
author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-10-30 13:49:39 +0000 |
---|---|---|
committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-10-30 13:49:39 +0000 |
commit | ebdc6e49ea59aeb8783d73c9a030a23baa6ffb1d (patch) | |
tree | 3292c6c21514ebbd19099c9299bd61323d545731 /TAO | |
parent | 1f572806b84a24a59c17abb0bfe39341e38ab6e2 (diff) | |
download | ATCD-ebdc6e49ea59aeb8783d73c9a030a23baa6ffb1d.tar.gz |
Mon Oct 30 13:48:48 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 5 | ||||
-rw-r--r-- | TAO/tests/Bug_2654_Regression/client.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 53c69af4b40..362fb8ca533 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 30 13:48:48 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Bug_2654_Regression/client.cpp (init_callback): + Scoreboard cleanup. + Sun Oct 29 17:08:21 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * tests/Bug_2654_Regression/Hello.cpp: diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index 09007162880..a340b08ede0 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -179,8 +179,8 @@ init_callback (Worker &w) PortableServer::ServantBase_var owner = servant; PortableServer::ObjectId_var id = child_poa->activate_object (servant); - obj = child_poa->id_to_reference (id); - w.callback_ = Test::CallBack::_narrow(obj); + obj = child_poa->id_to_reference (id.in()); + w.callback_ = Test::CallBack::_narrow(obj.in()); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; |