diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-18 07:35:42 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-18 07:35:42 +0000 |
| commit | 86401322e8267fd1599fabc7f46d996b7d46d135 (patch) | |
| tree | db712ffb7ae2e6f037e6b026f8deb4c9b3935ad4 /TAO | |
| parent | 5eca00f2307f50f30249134e12976dafeae6ffb1 (diff) | |
| download | ATCD-86401322e8267fd1599fabc7f46d996b7d46d135.tar.gz | |
ChangeLogTag:Sat Mar 18 01:33:47 2000 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index aaeadc5865e..4874ca951e1 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sat Mar 18 01:33:47 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp: Changed to + use TAO_Notify_EventType::get_native to access the EventType. + Thanks to Darrell for pointing this out. + + * orbsvcs/orbsvcs/Notify/Notify_Types.h: Undid my previous hack. + Fri Mar 17 23:39:52 2000 Nanbor Wang <nanbor@cs.wustl.edu> * orbsvcs/orbsvcs/Notify/Notify_Types.h (class diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index 8fdc7e37e62..1dfab8a73eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -121,7 +121,7 @@ TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_Event_Listener *listen CORBA::ULong i = 0; for (iter.first (); iter.next (event_type); iter.advance (), ++i) - added[i] = event_type->event_type_; + added[i] = event_type->get_native (); this->event_manager_->subscribe_for_events (listener, 0, @@ -146,7 +146,7 @@ TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_Event_Listener *list CORBA::ULong i = 0; for (iter.first (); iter.next (event_type); iter.advance (), ++i) - removed[i] = event_type->event_type_; + removed[i] = event_type->get_native (); this->event_manager_->subscribe_for_events (listener, 0, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h index 39402f525fa..d47b3b25e08 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h @@ -35,8 +35,6 @@ class TAO_Notify_EventType // It is used by the Event Manager as a key to find subscription lists. // public: - friend class TAO_Notify_ConsumerAdmin_i; - // = Initialization and termination TAO_Notify_EventType (void); TAO_Notify_EventType (const char* domain_name, const char* type_name); |