diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-15 13:17:30 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-19 11:38:24 +0200 |
commit | 1e78bdc724e95898c04a3409b0b192aa7f77780b (patch) | |
tree | d26ae47ae9956612b5973f536219f0c9b455db03 /odb/polymorphic-object-result.hxx | |
parent | 5b0430fdf4617b396e462872d438a663b174a3a8 (diff) |
Implement early connection release
Diffstat (limited to 'odb/polymorphic-object-result.hxx')
-rw-r--r-- | odb/polymorphic-object-result.hxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/odb/polymorphic-object-result.hxx b/odb/polymorphic-object-result.hxx index 5804db5..59592b1 100644 --- a/odb/polymorphic-object-result.hxx +++ b/odb/polymorphic-object-result.hxx @@ -26,8 +26,6 @@ namespace odb class polymorphic_object_result_impl: public result_impl { protected: - typedef odb::database database_type; - // In result_impl, T is always non-const and the same as object_type. // typedef T object_type; @@ -49,15 +47,9 @@ namespace odb friend class object_result_iterator<const T, id_type, true>; protected: - polymorphic_object_result_impl (database_type& db) - : begin_ (true), end_ (false), db_ (db), current_ () - { - } - - database_type& - database () const + polymorphic_object_result_impl (connection& conn) + : result_impl (conn), begin_ (true), end_ (false), current_ () { - return db_; } // To make this work with all kinds of pointers (raw, std::auto_ptr, @@ -167,7 +159,6 @@ namespace odb load (); private: - database_type& db_; pointer_type current_; typename pointer_traits::guard guard_; }; |