diff options
| author | Steve Huston <shuston@riverace.com> | 2009-06-12 11:56:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2009-06-12 11:56:51 +0000 |
| commit | 483ad8b0c75cbb0a1ffc828712fd0aa6150a5d6c (patch) | |
| tree | 64ceb53a71c0a2193d8a84294036b942ae9006ad | |
| parent | a3e35f6589e02eff4d64c4abdfe43eb2dbdd22d1 (diff) | |
| download | ATCD-483ad8b0c75cbb0a1ffc828712fd0aa6150a5d6c.tar.gz | |
ChangeLogTag:Fri Jun 12 11:24:09 UTC 2009 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/Dev_Poll_Reactor.cpp | 2 | ||||
| -rw-r--r-- | ACE/tests/run_test.lst | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6b5e2c5fa61..1b7aff252ce 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Fri Jun 12 11:24:09 UTC 2009 Steve Huston <shuston@riverace.com> + + * ace/Dev_Poll_Reactor.cpp: Added missing ifdef ACE_HAS_EVENT_POLL. + + * tests/run_test.lst: Removed !FIXED_BUGS_ONLY from those fixed: + Reactor_Dispatch_Order_Test_Dev_Poll + Reactor_Remove_Resume_Test_Dev_Poll + Refcounted_Event_Handler_Test_DevPoll + Fri Jun 12 00:45:09 UTC 2009 Steve Huston <shuston@riverace.com> * ace/Dev_Poll_Reactor.{h cpp inl}: Fixed multi-thread behavior of diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 06f1b078754..a49e9c40f4d 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -693,8 +693,10 @@ ACE_Dev_Poll_Reactor::open (size_t size, if (this->initialized_) return -1; +#ifdef ACE_HAS_EVENT_POLL ACE_OS::memset (&this->event_, 0, sizeof (this->event_)); this->event_.data.fd = ACE_INVALID_HANDLE; +#endif /* ACE_HAS_EVENT_POLL */ this->restart_ = restart; this->signal_handler_ = sh; diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index dda8188700c..8f9ccaf7cc5 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -138,14 +138,14 @@ Process_Semaphore_Test: !VxWorks !ACE_FOR_TAO !PHARLAP RB_Tree_Test Bug_3332_Regression_Test Reactor_Dispatch_Order_Test -Reactor_Dispatch_Order_Test_Dev_Poll: !FIXED_BUGS_ONLY +Reactor_Dispatch_Order_Test_Dev_Poll: Reactor_Exceptions_Test Reactor_Notify_Test: !ST !ACE_FOR_TAO Reactor_Notification_Queue_Test Reactor_Performance_Test: !ACE_FOR_TAO Reactor_Registration_Test Reactor_Remove_Resume_Test -Reactor_Remove_Resume_Test_Dev_Poll: !FIXED_BUGS_ONLY +Reactor_Remove_Resume_Test_Dev_Poll: Reactor_Timer_Test: !ACE_FOR_TAO Reactors_Test Reader_Writer_Test @@ -153,7 +153,7 @@ Recursive_Condition_Test: !ST Recursive_Mutex_Test: !ST Refcounted_Auto_Ptr_Test: !ACE_FOR_TAO Reference_Counted_Event_Handler_Test -d 0 -Refcounted_Event_Handler_Test_DevPoll: !FIXED_BUGS_ONLY +Refcounted_Event_Handler_Test_DevPoll: Reverse_Lock_Test RW_Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Sendfile_Test: !QNX !NO_NETWORK !VxWorks !LabVIEW_RT |