diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-19 19:39:35 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-19 19:39:35 +0000 |
commit | 944bf492b6a90daeecaf8cf9fa7d188cdd5ed4b2 (patch) | |
tree | 369b96e78c75f5d3a7d97bec80d3673e87b57f16 | |
parent | 7059e68d8612972679cea89bd67da7ba82cd65df (diff) | |
download | ATCD-944bf492b6a90daeecaf8cf9fa7d188cdd5ed4b2.tar.gz |
ChangeLogTag: Mon Mar 19 11:37:43 2001 Irfan Pyarali <irfan@cs.wustl.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
-rw-r--r-- | TAO/examples/POA/FindPOA/FindPOA.cpp | 3 | ||||
-rw-r--r-- | TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index dca1ab74541..d8127f79896 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Mon Mar 19 11:37:43 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp (main): + * examples/POA/FindPOA/FindPOA.cpp (find_non_existant_POA): + + In non-debug compiles, asserts disappear. Thus it was necessary + to add ACE_UNUSED_ARG to variables that are just being asserted + on. + + * TAOACE.dsw: Added ACE DLL to gpref dependencies. + Mon Mar 19 12:59:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Faults/run_test.pl: Fixed a problem that was signaling a diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp index e307f3bd14f..871d89108c9 100644 --- a/TAO/examples/POA/FindPOA/FindPOA.cpp +++ b/TAO/examples/POA/FindPOA/FindPOA.cpp @@ -46,6 +46,9 @@ find_non_existant_POA (PortableServer::POA_ptr parent, ACE_ENDTRY; ACE_ASSERT (expected_exception_raised); + + // In non-debug compiles, asserts will disappear. + ACE_UNUSED_ARG (expected_exception_raised); } int diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index 79c14c45576..b6a0439899a 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -182,7 +182,6 @@ main (int argc, char **argv) Worker worker1 (object1.in ()); Worker worker2 (object2.in ()); - int result = worker1.activate (THR_BOUND) != 0 || worker2.activate (THR_BOUND) != 0; @@ -191,6 +190,9 @@ main (int argc, char **argv) result = ACE_Thread_Manager::instance ()->wait (); ACE_ASSERT (result == 0); + // In non-debug compiles, asserts will disappear. + ACE_UNUSED_ARG (result); + root_poa->destroy (1, 1, ACE_TRY_ENV); |