Changeset e24dde for src/CodePatterns/Cacheable.hpp

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

959c82

Parents:

454bc54

git-author:

Frederik Heber <heber@…> (06/21/15 11:28:54)

git-committer:

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

Message:

FIX: Made Cacheables internally stored Observable const.

• recalcMethod() functor is given as ref in cstor.

File:

• src/CodePatterns/Cacheable.hpp (modified) (10 diffs)

src/CodePatterns/Cacheable.hpp

@@ -31 +31 @@
     class State{
     public:
-      State(Cacheable *_owner) :
+      State(Cacheable * const _owner) :
         busy(false),
         owner(_owner)
@@ -45 +45 @@
     protected:
       bool busy;
-      Cacheable *owner;
+      Cacheable * const owner;
     };
 
     class InvalidState : public State{
     public:
-      InvalidState(Cacheable *_owner):
+      InvalidState(Cacheable * const _owner):
         State(_owner)
         {}
@@ -80 +80 @@
     class ValidState : public State{
     public:
-      ValidState(Cacheable *_owner) :
+      ValidState(Cacheable * const _owner) :
         State(_owner)
         {}
@@ -112 +112 @@
     class DestroyedState : public State {
     public:
-      DestroyedState(Cacheable *_owner) :
+      DestroyedState(Cacheable * const _owner) :
         State(_owner)
         {}
@@ -145 +145 @@
   public:
     Cacheable(
-        Observable *_owner,
-        const boost::function<T()> _recalcMethod,
+        const Observable * const _owner,
+        const boost::function<T()> &_recalcMethod,
         const std::string &name,
         const Observable::channels_t &_channels = Observable::channels_t());
@@ -167 +167 @@
     // destroyed state is not predefined, because we rarely enter that state and never leave
 
-    const Observable * owner;
+    const Observable * const owner;
     const boost::function<T()> recalcMethod;
 
@@ -180 +180 @@
   template<typename T>
   Cacheable<T>::Cacheable(
-      Observable *_owner,
-      const boost::function<T()> _recalcMethod,
+      const Observable * const _owner,
+      const boost::function<T()> &_recalcMethod,
       const std::string &_name,
       const Observable::channels_t &_channels) :
@@ -234 +234 @@
           owner->signOff(this,*iter);
       }
+      const_cast<const Observable *&>(owner) = NULL;
     }
   }
@@ -283 +284 @@
   {
   public:
-    Cacheable(Observable *_owner, boost::function<T()> _recalcMethod,std::string name);
+    Cacheable(
+        const Observable * const _owner,
+        boost::function<T()> &_recalcMethod,
+        std::string name,
+        const Observable::channels_t &_channels);
     virtual ~Cacheable();
 
@@ -299 +304 @@
 
   template<typename T>
-  Cacheable<T>::Cacheable(Observable *_owner, boost::function<T()> _recalcMethod, std::string name) :
+  Cacheable<T>::Cacheable(
+      const Observable * const _owner,
+      boost::function<T()> &_recalcMethod,
+      std::string name,
+      const Observable::channels_t &_channels) :
     Observer(name),
     recalcMethod(_recalcMethod)