diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | ace/Reactor.h | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8bb86016d9c..8bd27a1c78e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Oct 7 14:54:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/Reactor.h: Renamed a variable name, signals to sigset. The + former was creating problems when Reactor is used with + Qt. Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for + reporting the problem. + + * Makefile: Added Kokyu to the list of controlled files. Thanks to + Don Hinton for the patch and Werner Buchert for reporting the + problem. + Tue Oct 07 14:01:11 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Mem_Map/IO-tests/test_io.cpp: @@ -154,6 +154,7 @@ CONTROLLED_FILES = \ os-patches \ performance-tests \ tests \ + Kokyu \ websvcs RELEASE_FILES = \ diff --git a/ace/Reactor.h b/ace/Reactor.h index 5a9e8b89a79..b6aa24589d4 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -405,7 +405,7 @@ public: * multiple times for the same <event_handler> and <sig_action> but * different <signals>. */ - virtual int register_handler (const ACE_Sig_Set &signals, + virtual int register_handler (const ACE_Sig_Set &sigset, ACE_Event_Handler *event_handler, ACE_Sig_Action *sig_action = 0); |