summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-02-15 08:52:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-02-15 08:52:25 +0000
commitc4291262af639e5e4701de9915527c298fdcf8db (patch)
tree9a443b1748121e17e0d69f361f1fe339f9087d76 /TAO
parent644f0bd44ac5127ad64dfd610b0b6187ad82cf20 (diff)
downloadATCD-c4291262af639e5e4701de9915527c298fdcf8db.tar.gz
Fri Feb 15 08:52:41 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/Crashed_Callback/server.cpp4
-rw-r--r--TAO/tests/Server_Connection_Purging/server.cpp4
3 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8c8f726ec29..8908e8e75e7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 15 08:52:41 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Crashed_Callback/server.cpp:
+ * tests/Server_Connection_Purging/server.cpp:
+ Fixed GCC 2.96 warnings
+
Thu Feb 14 16:31:05 UTC 2008 Ciju John <johnc at ociweb dot com>
* tests/Bug_3154_Regression/run_test.pl:
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 790ab7c4ba2..500c429cd03 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -85,13 +85,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (parse_args (argc, argv) != 0)
return 1;
- Service *service_impl;
+ Service *service_impl = 0;
ACE_NEW_RETURN (service_impl,
Service,
1);
PortableServer::ServantBase_var owner_transfer(service_impl);
- service_impl->orb_ = CORBA::ORB::_duplicate (orb);
+ service_impl->orb_ = CORBA::ORB::_duplicate (orb.in());
PortableServer::ObjectId_var id =
root_poa->activate_object (service_impl);
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 8c4b4a14f81..846724b0b5c 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -53,9 +53,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (parse_args (argc, argv) != 0)
return 1;
- test_i *test_impl;
+ test_i *test_impl = 0;
ACE_NEW_RETURN (test_impl,
- test_i (orb),
+ test_i (orb.in ()),
1);
PortableServer::ServantBase_var owner_transfer(test_impl);