summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2013-04-30 17:13:26 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2013-04-30 17:13:26 +0000
commit983b1f744bb37210d872a0480e1a517e974dc0bc (patch)
tree804d0e7cf4e0382c5ca79dcb857449a1ea7534b1
parent958c227902cd0edc1724a5b1cdb8f8ea12abf6ad (diff)
downloadATCD-983b1f744bb37210d872a0480e1a517e974dc0bc.tar.gz
Tue Apr 30 17:13:13 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_3384_Regression/Server_i.cpp: Fixed OpenVMS compile error
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/Bug_3384_Regression/Server_i.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d1ce12b8568..7716e601bc1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 30 17:13:13 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Bug_3384_Regression/Server_i.cpp:
+ Fixed OpenVMS compile error
+
Tue Apr 30 16:29:22 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl:
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp
index 3df4aba1563..7535a7ba5b8 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp
@@ -14,7 +14,7 @@ void Server::request (
::CORBA::Long sel)
{
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server::request -> %d\n", sel));
- if (! CORBA::is_nil (this->cli_))
+ if (! CORBA::is_nil (this->cli_.in ()))
{
this->cli_->reply ("Hello world!");
}