diff options
| author | sharath <sharath@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-03 00:05:40 +0000 |
|---|---|---|
| committer | sharath <sharath@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-03 00:05:40 +0000 |
| commit | 98481e87960208c54ffb420e9055a280d4612029 (patch) | |
| tree | 348eaf3043823ef091e2ea329320a06d30284bab | |
| parent | 9c02821da9eb2500a827fd3fa86f3b3784954af7 (diff) | |
| download | ATCD-98481e87960208c54ffb420e9055a280d4612029.tar.gz | |
ChangeLogTag: Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/QtReactor.cpp | 17 |
4 files changed, 32 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 1bfa33297ac..223382cab24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * ace/QtReactor.cpp: + Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting + and fixing the problem - crashing of TAO/tests/QtTests/ client + example after moving the slider. + Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/ MEM_Acceptor.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 1bfa33297ac..223382cab24 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * ace/QtReactor.cpp: + Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting + and fixing the problem - crashing of TAO/tests/QtTests/ client + example after moving the slider. + Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/ MEM_Acceptor.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1bfa33297ac..223382cab24 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * ace/QtReactor.cpp: + Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting + and fixing the problem - crashing of TAO/tests/QtTests/ client + example after moving the slider. + Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/ MEM_Acceptor.cpp: diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp index 15d6a7d3acc..1f1cec7d25e 100644 --- a/ace/QtReactor.cpp +++ b/ace/QtReactor.cpp @@ -28,6 +28,11 @@ ACE_QtReactor::ACE_QtReactor (QApplication *qapp, #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->notify_handler_->close (); + + // Patch for MS Windows: close and open doesn't clear the read + // fd_set, so reset it manually + this->wait_set_.rd_mask_.reset (); + this->notify_handler_->open (this, 0); #endif /* ACE_MT_SAFE */ } @@ -94,7 +99,7 @@ ACE_QtReactor::read_event (int handle) // Send read event ACE_Select_Reactor_Handle_Set dispatch_set; - dispatch_set.rd_mask_.set_bit (handle); + dispatch_set.rd_mask_.set_bit (ACE_HANDLE(handle)); this->dispatch (1, dispatch_set); } @@ -104,7 +109,7 @@ ACE_QtReactor::write_event (int handle) // Send write event ACE_Select_Reactor_Handle_Set dispatch_set; - dispatch_set.wr_mask_.set_bit (handle); + dispatch_set.wr_mask_.set_bit (ACE_HANDLE(handle)); this->dispatch (1, dispatch_set); } @@ -114,7 +119,7 @@ ACE_QtReactor::exception_event (int handle) // Send exception event ACE_Select_Reactor_Handle_Set dispatch_set; - dispatch_set.ex_mask_.set_bit(handle); + dispatch_set.ex_mask_.set_bit(ACE_HANDLE(handle)); dispatch (1, dispatch_set); } @@ -183,7 +188,7 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle , } ACE_NEW_RETURN (qsock_read_notifier, - QSocketNotifier (handle, QSocketNotifier::Read), + QSocketNotifier (int(handle), QSocketNotifier::Read), -1); this->read_notifier_.bind (handle, @@ -217,7 +222,7 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle , } ACE_NEW_RETURN (qsock_write_notifier, - QSocketNotifier (handle, QSocketNotifier::Write), + QSocketNotifier (int(handle), QSocketNotifier::Write), -1); this->write_notifier_.bind (handle, @@ -250,7 +255,7 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle , } ACE_NEW_RETURN (qsock_excpt_notifier, - QSocketNotifier (handle, QSocketNotifier::Exception), + QSocketNotifier (int(handle), QSocketNotifier::Exception), -1); this->exception_notifier_.bind (handle, |