aboutsummaryrefslogtreecommitdiff
path: root/odb/sqlite/polymorphic-object-statements.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-06-18 09:32:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-06-18 09:32:09 +0200
commit31995832803d21aad266258d5cc1022bc086c2b7 (patch)
tree4e86c80562f4c408f683d27336cf1bedab01e313 /odb/sqlite/polymorphic-object-statements.hxx
parenta64a2d583b948308d287ab0940ca6c1958f771a4 (diff)
Allocate container traits lazily and only when their definition is seen
This fixes a problem with polymorphic hierarchies spread over multiple files in which case the source code for the derived class does not have the definition of the container traits for the base class. See the comment in the source code for further details.
Diffstat (limited to 'odb/sqlite/polymorphic-object-statements.hxx')
-rw-r--r--odb/sqlite/polymorphic-object-statements.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/odb/sqlite/polymorphic-object-statements.hxx b/odb/sqlite/polymorphic-object-statements.hxx
index 1212176..54319ee 100644
--- a/odb/sqlite/polymorphic-object-statements.hxx
+++ b/odb/sqlite/polymorphic-object-statements.hxx
@@ -363,7 +363,7 @@ namespace odb
container_statement_cache_type&
container_statment_cache ()
{
- return container_statement_cache_;
+ return container_statement_cache_.get (conn_);
}
public:
@@ -395,7 +395,8 @@ namespace odb
root_statements_type& root_statements_;
base_statements_type& base_statements_;
- container_statement_cache_type container_statement_cache_;
+ container_statement_cache_ptr<container_statement_cache_type>
+ container_statement_cache_;
image_type image_;