diff options
| -rw-r--r-- | STL/ChangeLog | 4 | ||||
| -rw-r--r-- | STL/bool.h | 8 | ||||
| -rw-r--r-- | ace/ReactorEx.cpp | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/STL/ChangeLog b/STL/ChangeLog index 76c0ec98a8a..c47b49229a7 100644 --- a/STL/ChangeLog +++ b/STL/ChangeLog @@ -1,3 +1,7 @@ +Fri Dec 6 02:08:35 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> + + * bool.h: Made the defines for bool, true, and false conditional. + Wed Dec 4 00:17:11 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> * vector.h: Modified to remove the default argument to the diff --git a/STL/bool.h b/STL/bool.h index dd73435e51e..6478add649a 100644 --- a/STL/bool.h +++ b/STL/bool.h @@ -23,9 +23,17 @@ namespace std { * */ +#if !defined (bool) #define bool int +#endif /* bool */ + +#if !defined (true) #define true 1 +#endif /* true */ + +#if !defined (false) #define false 0 +#endif /* false */ /* *Added by d:\\convert.pl --begin-- diff --git a/ace/ReactorEx.cpp b/ace/ReactorEx.cpp index 2ee63d21e6d..caa499ff8dc 100644 --- a/ace/ReactorEx.cpp +++ b/ace/ReactorEx.cpp @@ -82,10 +82,6 @@ ACE_ReactorEx::remove_handler (ACE_Event_Handler *eh, handlers_[index]->handle_close (handle, ACE_Event_Handler::NULL_MASK); - // Reinitial the ReactorEx pointer since we no longer point - // to this one. - handlers_[index]->reactorEx (0); - // If there was only one handle, reset the pointer to 0. if (this->active_handles_ == 1) { |