diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-17 16:24:28 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-17 16:24:28 +0000 |
| commit | 88a146ef23814aea10322bf4cbce65eb4f163aaa (patch) | |
| tree | 80e32554b02df1f5c0d128c25dd22eda37aa7788 | |
| parent | e6e54b8063ae4afdade2d56cae0f47a84ef9efa3 (diff) | |
| download | ATCD-88a146ef23814aea10322bf4cbce65eb4f163aaa.tar.gz | |
ChangeLogTag:Fri Nov 17 08:23:03 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/TAO_Service/TAO_Service.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Makefile | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index eda365ce332..55c1e8848c2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Fri Nov 17 08:23:03 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/Makefile: + Removed ior_corbaloc, it uses the Naming Service, and would take + me too long to fix it. + + * orbsvcs/TAO_Service/TAO_Service.cpp: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: + Fixed warnings. + Fri Nov 17 07:36:03 2000 Carlos O'Ryan <coryan@uci.edu> * tests/DSI_Gateway/run_test.pl: diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp index 51c972c2448..450826e0b67 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -42,9 +42,6 @@ main (int argc, ACE_TCHAR *argv[]) ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); - ACE_Reactor *reactor = - orb->orb_core ()->reactor (); - for (;;) { ACE_Time_Value tv (5, 0); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 3827bab295c..fbc3781a86a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -418,7 +418,7 @@ Notify_Throughput::end_test (CORBA::Environment &ACE_TRY_ENV) dump_results (); ACE_DEBUG ((LM_DEBUG, "calling shutdown\n")); - this->orb_->shutdown (); + this->orb_->shutdown (0, ACE_TRY_ENV); } diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 1b065ae50bc..d53d49b197e 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -47,8 +47,7 @@ DIRS = CDR \ Forwarding \ Exposed_Policies \ Smart_Proxies \ - QtTests \ - ior_corbaloc + QtTests ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO |