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, 6 insertions, 2 deletions

diff --git a/src/unstable/myriadcache.h b/src/unstable/myriadcache.h
index 9bc926f..d19395a 100644
--- a/src/unstable/myriadcache.h
+++ b/src/unstable/myriadcache.h
@@ -54,6 +54,7 @@ namespace Bu
         }
        
         using typename Bu::CacheBase<keytype,obtype>::KeyList;
+        using typename Bu::CacheBase<keytype,obtype>::ObjectType;
         
         virtual typename Bu::CacheBase<keytype,obtype>::KeyList getKeys() const
         {
@@ -92,10 +93,13 @@ namespace Bu
             bStructureChanged = true;
         }
 
-        virtual obtype *_load( const keytype &k )
+        virtual obtype *_load(
+            typename Bu::CacheObject<keytype, obtype>::Initializer &initObj,
+            const keytype &k
+            )
         {
             Bu::MyriadStream ms = mStore.openStream( hIndex.get( k ) );
-            return _cacheObjectLoad<obtype>( ms );
+            return _cacheObjectLoad<keytype, obtype>( initObj, k, ms );
         }
 
         virtual void _save( const obtype *o )