diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-09-29 12:42:06 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-09-29 12:42:06 +0000 |
| commit | ae98b0a704c65fd72a487840a178f60b157acf08 (patch) | |
| tree | da880e4c48304b05df9d7185add40c4a66a05b38 | |
| parent | 2e8d7e148847aa63fd42183eaeaca0884674c308 (diff) | |
| download | ATCD-ae98b0a704c65fd72a487840a178f60b157acf08.tar.gz | |
ChangeLogTag: Thu Sep 29 07:38:32 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/dtor/client.cpp | 9 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/dtor/server.cpp | 6 |
3 files changed, 20 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index da7135c1d9e..13eb6dd4fa2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Sep 29 07:38:32 2005 Chad Elliott <elliott_c@ociweb.com> + + * tests/Smart_Proxies/dtor/client.cpp: + * tests/Smart_Proxies/dtor/server.cpp: + + Corrected build issues (include files, exception macros and + minimum corba related problems) and warnings from certain versions + of the GNU compiler about implicit conversion. + Thu Sep 29 12:34:50 2005 Simon McQueen <sm@prismtech.com> * tao/Makefile.am: diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp index ed6580cc69a..5091bce84b5 100644 --- a/TAO/tests/Smart_Proxies/dtor/client.cpp +++ b/TAO/tests/Smart_Proxies/dtor/client.cpp @@ -1,5 +1,7 @@ //$Id$ +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" #include "testC.h" #include "Smart_Proxy_Impl.h" @@ -73,14 +75,19 @@ int main (int argc, char* argv[]) server->hello(3); +#if (TAO_HAS_MINIMUM_CORBA == 0) // Testing the _non_existent function ACE_DEBUG ((LM_DEBUG, "Testing _non_existent()\n")); - if (server->_non_existent()) + CORBA::Boolean ne = + server->_non_existent(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + if (ne) ACE_ERROR_RETURN ((LM_ERROR, "Not a Messenger object reference\n"), 1); else ACE_DEBUG ((LM_DEBUG,"Successfully called _non_existent()\n")); +#endif /* TAO_HAS_MINIMUM_CORBA */ server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 9d8611643ee..fa9eadf988b 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -2,9 +2,9 @@ #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_string.h" -class Test_i: public virtual POA_Test, - public virtual PortableServer::RefCountServantBase +class Test_i: public virtual POA_Test { public: Test_i (CORBA::ORB_ptr orb); @@ -100,7 +100,7 @@ int main (int argc, char* argv[]) ACE_TRY_CHECK; // Create a servant - Test_i servant (orb); + Test_i servant (orb.in ()); PortableServer::ObjectId_var oid = root_poa->activate_object (&servant |