Changeset dd7c44 for src/CodePatterns/Observer/Observable.hpp

Timestamp:

Oct 30, 2015, 11:43:20 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

6e2f3b

Parents:

1f96ec

git-author:

Frederik Heber <heber@…> (07/10/15 09:44:07)

git-committer:

Frederik Heber <heber@…> (10/30/15 11:43:20)

Message:

Added static functions to control access to static NotificationChannels.

• Relay is friend as it uses the mutex when accessing.
• this is to protect changes in NotificationChannels from changes outside the scope of this library.

File:

• src/CodePatterns/Observer/Observable.hpp (modified) (3 diffs)

src/CodePatterns/Observer/Observable.hpp

@@ -45 +45 @@
  */
 class Observable : public Observer {
+  //!> grant Relay access to NotificationChannels as we know it uses the mutex as well
+  friend class Relay;
 public:
   //!> typedef for a vector of channels
@@ -134 +136 @@
 
 protected:
+
+  static void insertNotificationChannel( std::pair<Observable*, Channels *> _pair);
+  static void eraseNotificationChannel(Observable * const _target);
+  static bool isNotificationChannelPresent(const Observable * const _target);
+  static const Channels *getNotificationChannels(const Observable * const _target);
+  static Notification_ptr getNotificationChannel(const Observable * const _target, const size_t _no);
+
+private:
 
   typedef std::map<Observable*, Channels *> ChannelMap;
@@ -188 +198 @@
 #define PASTE_HELPER(a,b) a ## b
 #define OBSERVE Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(this)
-#define NOTIFY(channelno) do{Observable::enque_notification_internal(this,NotificationChannels[this]->getChannel(channelno));}while(0)
+#define NOTIFY(channelno) do{Observable::enque_notification_internal(this,Observable::getNotificationChannel(this,channelno));}while(0)
 #define LOCK_OBSERVABLE(observable) Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(&(observable))