diff options
| author | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-24 14:20:09 +0000 |
|---|---|---|
| committer | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-24 14:20:09 +0000 |
| commit | 0baff9804a9268a5e5339c70f99c0678815cc308 (patch) | |
| tree | dfb58fe92e2f39d9491715e6c61dde62cfe88326 | |
| parent | 56708b226f9483430e73a1fb3fff2027fdedbf86 (diff) | |
| download | ATCD-0baff9804a9268a5e5339c70f99c0678815cc308.tar.gz | |
ChangeLogTag: Tue May 24 09:14:57 2005 Justin Michel <michel_j@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/ImR/Advanced/TestServer.h | 1 | ||||
| -rw-r--r-- | TAO/tao/ImR_Client/ImplRepoC.h | 2 |
4 files changed, 19 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3b6a382b3e3..88a0dc1f56c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Tue May 24 09:14:57 2005 Justin Michel <michel_j@ociweb.com> + + * orbsvcs/examples/ImR/Advanced/TestServer.h: + * orbsvcs/examples/ImR/Advanced/TestServer.cpp: + + This example was simply copied from 1.4a, and I forgot to make + the adjustments required by the POA refactoring. + + * tao/ImR_Client/ImplRepoC.h: + + The ImplRepo.pidl had #include ServerObject.pidl, but didn't include + ServerObjectC.h. For now, I manually added the include, but this isn't + a final solution. + Mon May 23 14:50:27 2005 Justin Michel <michel_j@ociweb.com> * orbsvcs/examples/ImR/Advanced/Advanced.mpc: diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp index 96a8d61092c..1908d473841 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp @@ -6,6 +6,7 @@ #include "tao/Profile.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" +#include "tao/PortableServer/Root_POA.h" #include "ace/streams.h" #include "ace/OS_NS_unistd.h" @@ -497,9 +498,9 @@ void TestServer::buildObjects() else // use IOR table { // Write out corbaloc - TAO_POA* tmp_poa = sub_poa->_tao_poa_downcast(); + TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(sub_poa.in()); // Make entry into ior table using the non IMRified object ref. - CORBA::Object_var obj = tmp_poa->id_to_reference(oid.in(), false); + CORBA::Object_var obj = tmp_poa->id_to_reference_i(oid.in(), false); CORBA::String_var ior = orb_->object_to_string(obj.in()); string key = (poaName + "/" + objName); iorTable_->bind(key.c_str(), ior.in()); diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h index 261b37c35e3..d18bd441c6b 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h @@ -4,7 +4,6 @@ #include "ace/Auto_Ptr.h" #include "tao/IORTable/IORTable.h" -#include "tao/PortableServer/POA.h" #include <string> #include <vector> diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h index f2628c157e0..dc542c79243 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.h +++ b/TAO/tao/ImR_Client/ImplRepoC.h @@ -41,6 +41,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "imr_client_export.h" +#include "ServerObjectC.h" + #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" |