summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-03-26 02:22:06 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-03-26 02:22:06 +0000
commitf94deaed5c238b83c8d2ad42a129c762b6a50301 (patch)
tree5a055e5d54e4910465200f82e96cd0daf011f061
parentd26feaa7f6b700b76cd2a51b2123606d7466d261 (diff)
downloadATCD-f94deaed5c238b83c8d2ad42a129c762b6a50301.tar.gz
ChangeLogTag: Sun Mar 25 20:18:18 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp8
2 files changed, 15 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 72ebaf53af9..f953c3ced82 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Sun Mar 25 20:18:18 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp:
+ Fixed a warning with KCC builds. The ACE_ASSERTs dissappear in
+ non-debug builds. Added ACE_UNUSED_ARG to prevent the compiler
+ from complaining about unused variables.
+
Sun Mar 25 18:15:39 2001 Angelo Corsaro <corsaro@danzon.cs.wustl.edu>
* tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl:
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 6b11ef81265..f447dab8b42 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -72,6 +72,8 @@ test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
// Make sure an exception was raised and it was of the correct type.
ACE_ASSERT (expected_exception_raised);
+
+ ACE_UNUSED_ARG (expected_exception_raised);
}
void
@@ -108,6 +110,8 @@ test_object_deactivation (PortableServer::POA_ptr poa,
// type.
ACE_ASSERT (expected_exception_raised);
+
+
poa->activate_object_with_id (id,
&servant,
ACE_TRY_ENV);
@@ -159,6 +163,10 @@ test_object_deactivation (PortableServer::POA_ptr poa,
test->deactivate_self (ACE_TRY_ENV);
ACE_CHECK;
+
+ // ACE_ASSERT dissappears in non-debug builds
+ ACE_UNUSED_ARG (expected_exception_raised);
+
}
int