summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2013-05-10 09:21:14 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2013-05-10 09:21:14 +0000
commit63f0c20999064c4762c15f04d6245a0f0c699bf5 (patch)
treee1db4d8f2041569d02b9124202cad08f6ce678f1
parent699bfa70ad9f7f64ad19917144d33213a92ef4a9 (diff)
downloadATCD-63f0c20999064c4762c15f04d6245a0f0c699bf5.tar.gz
Fri May 10 09:21:17 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/IORTable_Locator/async_server.cpp: Fixed LynxOS compile warning
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/IORTable_Locator/async_server.cpp7
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9f85b0d0c2f..92add31211c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 10 09:21:17 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/IORTable_Locator/async_server.cpp:
+ Fixed LynxOS compile warning
+
Thu May 9 19:52:26 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl:
diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp
index 0b5dbcc48c5..73757fdd503 100644
--- a/TAO/tests/IORTable_Locator/async_server.cpp
+++ b/TAO/tests/IORTable_Locator/async_server.cpp
@@ -158,19 +158,20 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa_manager->activate ();
// Create task.
- IORTable::Locator_var iorloc;
+ IORTable::Locator_ptr iorloc_ptr;
if (use_async_locator)
{
- ACE_NEW_RETURN (iorloc,
+ ACE_NEW_RETURN (iorloc_ptr,
AsyncLocatorTask (orb.in ()),
1);
}
else
{
- ACE_NEW_RETURN (iorloc,
+ ACE_NEW_RETURN (iorloc_ptr,
SyncLocatorTask (orb.in ()),
1);
}
+ IORTable::Locator_var iorloc = iorloc_ptr;
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Server - using ior table object: %C\n"),