summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-08-27 15:23:28 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-08-27 15:23:28 +0000
commit945d22722b65a02a7cbbaa1275ebf4945ae97318 (patch)
tree6a45ab25ca2be8adf9e286ca6123536885f9b88a
parent941a9ec729b84852d9438c79197693db38b45d69 (diff)
downloadATCD-945d22722b65a02a7cbbaa1275ebf4945ae97318.tar.gz
ChangeLogTag: Tue Aug 27 10:22:50 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tests/ORB_shutdown/server.cpp3
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b6feab8d395..923d901eef3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 27 10:22:50 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>
+
+ * tests/ORB_shutdown/server.cpp: Fixed a compile error in builds
+ where exceptions have been turned off.
+
Tue Aug 27 10:03:57 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>
* tests/ORB_shutdown/server.cpp:
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index a7941c61509..d110d0ff643 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -64,11 +64,12 @@ main (int argc, char *argv[])
"(%P|%t) server - shutting down the ORB\n"));
orb->shutdown (1
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) Finished shutting down the ORB\n"));
+
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;