diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-10 21:12:23 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-10 21:12:23 +0000 |
| commit | 6fbe6c5a5158404c979f4a654750dee1bcbd7d83 (patch) | |
| tree | 72703d56ee8018d32e1422f1557d09b93b21376a | |
| parent | b44273fc9dfcbd9236b2d4366b356a0ed586368b (diff) | |
| download | ATCD-6fbe6c5a5158404c979f4a654750dee1bcbd7d83.tar.gz | |
Mon Jun 10 21:03:58 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp:
Fix an ambiguity tripping up the OpenVMS build.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7d3ab55dd01..a6810f718a8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 10 21:03:58 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp: + + Fix an ambiguity tripping up the OpenVMS build. + Fri Jun 7 13:26:15 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tests/IPV6/run_test.pl: diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp index 7a1877b3a29..7ea73ac5f3e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp @@ -49,7 +49,7 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( { ++(*counter_); } - if (CORBA::is_nil(this->poa_)) + if (CORBA::is_nil(this->poa_.in())) { return; } |