Changeset 40f2e6 for src/Patterns/Observer/Observable.hpp

Timestamp:

Dec 13, 2011, 9:46:12 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

2c11c1

Parents:

75d156

git-author:

Frederik Heber <heber@…> (12/02/11 10:05:36)

git-committer:

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

Message:

Observable::signOn() now just needs channelno (enum) and not Notification_ptr.

• this makes life a bit easier and allows for relaying notifications.

File:

• src/Patterns/Observer/Observable.hpp (modified) (2 diffs)

src/Patterns/Observer/Observable.hpp

@@ -74 +74 @@
    * Sign on for specialized notifications
    */
-  virtual void signOn(Observer *target, Notification_ptr notification) const;
+  virtual void signOn(Observer *target, size_t channelno) const;
 
   /**
    * Stop receiving a specialized notification
    */
-  virtual void signOff(Observer *target, Notification_ptr notification) const;
+  virtual void signOff(Observer *target, size_t channelno) const;
 
   /**
@@ -146 +146 @@
 #define PASTE_HELPER(a,b) a ## b
 #define OBSERVE Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(this)
-#define NOTIFY(channelno) do{const ChannelMap::const_iterator iter=NotificationChannels.find(this);ASSERT(iter!=NotificationChannels.end(),"NOTIFY() - channel not found.");Observable::enque_notification_internal(this,iter->second->getChannel(channelno));}while(0)
+#define NOTIFY(channelno) do{Observable::enque_notification_internal(this,NotificationChannels[this]->getChannel(channelno));}while(0)
 #define LOCK_OBSERVABLE(observable) Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(&(observable))