summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog-98a34
-rw-r--r--ace/Select_Reactor.h2
-rw-r--r--ace/WFMO_Reactor.h2
3 files changed, 20 insertions, 18 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a
index 9ef11326680..ee349cd95f6 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,21 +1,13 @@
-Wed Apr 01 16:28:30 1998 David L. Levine <levine@cs.wustl.edu>
-
- * ace/Reactor.{h,cpp},Reactor_Impl.h (dump): added dump ()
- method, which calls the (existing) dump () in the reactor
- implementation.
+Wed Apr 1 15:40:01 1998 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
- * ace/High_Res_Timer.* (hrtime_to_tv): fixed conversion of
- ACE_hrtime_t to ACE_Time_Value to be compatible with
- ACE_U_LongLong.
-
-Wed Apr 1 13:48:00 1998 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu>
-
- * ace/OS.h: Changed ACE_HAS_STL_MAP_CONFLICT to
- ACE_HAS_STL_QUEUE_CONFLICT for the appropriate cases in ACE.
- Thanks to Russ Noseworthy <rnosewor@objectsciences.com> for
- reporting this.
+ * ace: Made the WMFO_Reactor and Select_Reactor's dump() methods
+ virtual to underscore the fact that the Reactor_Impl's new
+ dump() method is also virtual.
-Wed Apr 1 11:27:39 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+ * ace/OS.h: Changed ACE_HAS_STL_MAP_CONFLICT to
+ ACE_HAS_STL_QUEUE_CONFLICT for the appropriate cases in ACE.
+ Thanks to Russ Noseworthy <rnosewor@objectsciences.com> for
+ reporting this.
* ace/CORBA_Handler.cpp (ACE_CORBA_Handler): The reference_count_
data member wasn't being initialized correctly. Thanks to
@@ -26,6 +18,16 @@ Wed Apr 1 11:27:39 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
with SunOS 5.5 and 5.6. Thanks to Mahesh Chandwani
<chandwani@lucent.com> for reporting this.
+Wed Apr 01 16:28:30 1998 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/Reactor.{h,cpp},Reactor_Impl.h (dump): added dump ()
+ method, which calls the (existing) dump () in the reactor
+ implementation.
+
+ * ace/High_Res_Timer.* (hrtime_to_tv): fixed conversion of
+ ACE_hrtime_t to ACE_Time_Value to be compatible with
+ ACE_U_LongLong.
+
Wed Apr 01 09:32:27 1998 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Should not
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 1b776a8347a..fb268c8f977 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -709,7 +709,7 @@ public:
// deadlock efficiently when <ACE_Event_Handlers> are used in
// multiple threads.
- void dump (void) const;
+ virtual void dump (void) const;
// Dump the state of an object.
ACE_ALLOC_HOOK_DECLARE;
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 801cd9ad888..9a8c2a614e1 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -862,7 +862,7 @@ public:
ACE_ALLOC_HOOK_DECLARE;
// Declare the dynamic allocation hooks.
- void dump (void) const;
+ virtual void dump (void) const;
// Dump the state of an object.
protected: