diff options
| author | Steve Huston <shuston@riverace.com> | 2002-07-23 20:32:26 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-07-23 20:32:26 +0000 |
| commit | 4734457393b75adc2aba427e781be240d2410c79 (patch) | |
| tree | ae9afdb4494768ad4cf34f26e3113abfacada9cd | |
| parent | dfac5d8295004cfd8af6c9896c796a2c6ec5aae6 (diff) | |
| download | ATCD-4734457393b75adc2aba427e781be240d2410c79.tar.gz | |
ChangeLogTag:Tue Jul 23 16:20:39 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp | 4 | ||||
| -rw-r--r-- | TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 17b95b78726..d1283e9d539 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Jul 23 16:20:39 2002 Steve Huston <shuston@riverace.com> + + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp (is_full_i): + Cast this->cur_count_ to size_t to compare to high_water_mark_. + Corresponds to a ACE_Message_Queue change I made to ACE yesterday. + + * examples/Simulator/Event_Supplier/DualEC_Sup.{h cpp} + (DualEC_Supplier::run_orb, run_nav_thread, run_weap_thread): + Change return type from void * to ACE_THR_FUNC_RETURN to match + corresponding change in ACE. + Tue Jul 23 12:47:45 2002 Mayur Deshpande <mayur@ics.uci.edu> * tests/AMH_Exceptions/client.cpp (main): diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index ffff7d0873e..4f78f028217 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -318,7 +318,7 @@ DualEC_Supplier::run_orb (void *) // Run navigation event generation thread. -void * +ACE_THR_FUNC_RETURN DualEC_Supplier::run_nav_thread (void *arg) { DualEC_Supplier * sup = @@ -400,7 +400,7 @@ DualEC_Supplier::run_nav_thread (void *arg) // Run weapons event generation thread. -void * +ACE_THR_FUNC_RETURN DualEC_Supplier::run_weap_thread (void *arg) { DualEC_Supplier * sup = diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index 84b6f5e6ca2..37c7cb4a1bf 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -92,10 +92,10 @@ private: static ACE_THR_FUNC_RETURN run_orb (void *); // Run the orb event loop. - static void * run_nav_thread (void *arg); + static ACE_THR_FUNC_RETURN run_nav_thread (void *arg); // Run navigation event generation thread. - static void * run_weap_thread (void *arg); + static ACE_THR_FUNC_RETURN run_weap_thread (void *arg); // Run weapons event generation thread. int create_schedulers (void); |