diff options
| author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-05 15:13:32 +0000 |
|---|---|---|
| committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-05 15:13:32 +0000 |
| commit | 8dd23f71892808a050880069bce9674066749b81 (patch) | |
| tree | 3e6c751f609c9247e122fb86b6df16d078e9f62c | |
| parent | 59c4b50e98386428bff514dde58b0cecf88d9640 (diff) | |
| download | ATCD-8dd23f71892808a050880069bce9674066749b81.tar.gz | |
ChangeLogTag: Fri Jan 5 15:07:46 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/IIOP/client.cpp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fb789941638..6406ff977d0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 5 15:07:46 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tests/TransportCurrent/IIOP/client.cpp: + + Testing for minimum corba was wrong, causing invalid reference + to Object::_request member in minimum corba builds. + Fri Jan 5 13:35:47 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> * MPC/config/tc.mpb: diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index 21e7caf1456..3cb8df90cc0 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -13,7 +13,7 @@ #include "Client_ORBInitializer.h" -ACE_RCSID (PICurrent, +ACE_RCSID (IIOP, client, "$Id$") @@ -116,7 +116,7 @@ Worker::svc (void) // Minimum CORBA does not define Object::_request, so we're just // skipping the DII part in those cases. -#if (TAO_HAS_MINIMUM_CORBA != 0) +#if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) if (this->use_dii_too_) { @@ -134,7 +134,7 @@ Worker::svc (void) ACE_CHECK; } -#endif /* (TAO_HAS_MINIMUM_CORBA != 0) */ +#endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n"))); |