Changeset bc2698 for src/Patterns/Observer.cpp

Timestamp:

Dec 13, 2011, 9:43:39 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

e2e035e

Parents:

e7352a5

git-author:

Frederik Heber <heber@…> (12/01/11 09:09:18)

git-committer:

Frederik Heber <heber@…> (12/13/11 09:43:39)

Message:

NotificationChannels is now static entity.

• this is in line with the other static entities on Observable that are intended to save memory (before we needed 8 bytes for the pointer in each and every Observable instances, whether it had channels or not.)
• Modified NOTIFY macro to accomodate for the changes.
• enhanced documentation of class Notifications.

File:

• src/Patterns/Observer.cpp (modified) (2 diffs)

src/Patterns/Observer.cpp

@@ -43 +43 @@
 std::map<Observable*,std::set<Notification*> > Observable::notifications;
 set<Observable*> Observable::busyObservables; //!< Set of Observables that are currently busy notifying their sign-on'ed Observers
+Observable::ChannelMap Observable::NotificationChannels; //!< Map of Observables to their Channels.
 
 /** Attaching Sub-observables to Observables.
@@ -278 +279 @@
 Notification_ptr Observable::getChannel(size_t no) const
 {
-  ASSERT(NotificationChannels != NULL,
+  ChannelMap::iterator iter = NotificationChannels.find(const_cast<Observable *>(this));
+  ASSERT(iter != NotificationChannels.end(),
+      "Observable::getChannel() - we do not have a channel in NotificationChannels.");
+  const Channels *OurChannel = iter->second;
+  ASSERT(OurChannel != NULL,
       "Observable::getChannel() - observable has no channels.");
-  return NotificationChannels->getChannel(no);
+  return OurChannel->getChannel(no);
 }