diff options
| -rw-r--r-- | project2/basics/caches/memoryCache.cpp | 1 | ||||
| -rw-r--r-- | project2/common/rowSetCache.cpp | 2 | ||||
| -rw-r--r-- | project2/common/rowSetCache.h | 2 | ||||
| -rw-r--r-- | project2/sql/sqlCache.cpp | 1 | ||||
| -rw-r--r-- | project2/xml/xmlCache.cpp | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/project2/basics/caches/memoryCache.cpp b/project2/basics/caches/memoryCache.cpp index 8d4914b..3138760 100644 --- a/project2/basics/caches/memoryCache.cpp +++ b/project2/basics/caches/memoryCache.cpp @@ -96,6 +96,7 @@ class MemoryCache : public RowSetCache { > > CacheStore; MemoryCache(ScriptNodePtr p) : + SourceObject(p), RowSetCache(p) { } diff --git a/project2/common/rowSetCache.cpp b/project2/common/rowSetCache.cpp index e6d2884..b8c0ef6 100644 --- a/project2/common/rowSetCache.cpp +++ b/project2/common/rowSetCache.cpp @@ -7,8 +7,8 @@ #include <factory.impl.h> RowSetCache::RowSetCache(ScriptNodePtr p) : - IHaveParameters(p), SourceObject(p), + IHaveParameters(p), inherit(p->value("inherit", true, NULL).as<bool>()) { } diff --git a/project2/common/rowSetCache.h b/project2/common/rowSetCache.h index b365c72..9418463 100644 --- a/project2/common/rowSetCache.h +++ b/project2/common/rowSetCache.h @@ -10,7 +10,7 @@ class RowSet; class RowState; typedef boost::intrusive_ptr<const RowSet> RowSetCPtr; -class RowSetCache : public IHaveParameters, public SourceObject { +class RowSetCache : public IHaveParameters, public virtual SourceObject { public: RowSetCache(ScriptNodePtr p); diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp index cc2b451..db05543 100644 --- a/project2/sql/sqlCache.cpp +++ b/project2/sql/sqlCache.cpp @@ -22,6 +22,7 @@ typedef boost::shared_ptr<DB::ModifyCommand> ModifyPtr; class SqlCache : public RowSetCache { public: SqlCache(ScriptNodePtr p) : + SourceObject(p), RowSetCache(p), db(NULL) { diff --git a/project2/xml/xmlCache.cpp b/project2/xml/xmlCache.cpp index 40adec9..5e3c66c 100644 --- a/project2/xml/xmlCache.cpp +++ b/project2/xml/xmlCache.cpp @@ -14,6 +14,7 @@ class XmlCache : public RowSetCache { public: XmlCache(ScriptNodePtr p) : + SourceObject(p), RowSetCache(p) { } |