Updated the cache system. It now ensures that objects are initialized with

cache information before they are deserialized from storage.  This changed the
signature of the cache loading template function, but the new function isn't
harder to use, and provides the key information as well.

1 files changed, 31 insertions, 3 deletions

diff --git a/src/unstable/cacheobject.h b/src/unstable/cacheobject.h
index e83f706..ca70bb4 100644
--- a/src/unstable/cacheobject.h
+++ b/src/unstable/cacheobject.h
@@ -21,6 +21,7 @@ namespace Bu
     class CacheObject
     {
     friend class CacheBase<keytype, obtype>;
+    //friend class CacheObject<keytype, obtype>::Initializer;
     public:
         CacheObject() :
             pCache( NULL ),
@@ -35,6 +36,7 @@ namespace Bu
 
         typedef CacheObject<keytype, obtype> MyType;
         typedef CacheBase<keytype, obtype> CacheType;
+        typedef CacheEntry<keytype, obtype> EntryType;
 
         virtual keytype getKey() const=0;
         virtual int getPersistenceScore() const { return 0; }
@@ -94,18 +96,44 @@ namespace Bu
         {
             return pCache;
         }
+    
+    public:
+        class Initializer
+        {
+        friend class CacheBase<keytype,obtype>;
+        private:
+            Initializer( CacheBase<keytype,obtype> *pCache ) :
+                pCache( pCache )
+            {
+            }
+
+        public:
+            template<typename subtype>
+            subtype *operator()( subtype *pNewObj )
+            {
+                pNewObj->setCache( pCache );
+                return pNewObj;
+            }
+            
+        private:
+            CacheBase<keytype,obtype> *pCache;
+        };
+
 
     private:
-        typedef CacheEntry<keytype, obtype> Entry;
-        void setCache( CacheType *pCache, Entry *pEntry )
+        void setCache( CacheType *pCache )
         {
             this->pCache = pCache;
+        }
+
+        void setCacheEntry( EntryType *pEntry )
+        {
             this->pEntry = pEntry;
         }
 
     private:
         CacheType *pCache;
-        Entry *pEntry;
+        EntryType *pEntry;
         bool bChanged;
     };
 }