From 1e78bdc724e95898c04a3409b0b192aa7f77780b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 15 Oct 2012 13:17:30 +0200 Subject: Implement early connection release --- odb/simple-object-result.txx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'odb/simple-object-result.txx') diff --git a/odb/simple-object-result.txx b/odb/simple-object-result.txx index 5ee9686..60705e8 100644 --- a/odb/simple-object-result.txx +++ b/odb/simple-object-result.txx @@ -16,8 +16,7 @@ namespace odb // const id_type& id (load_id ()); - pointer_type p ( - object_traits::pointer_cache_traits::find (database (), id)); + pointer_type p (object_traits::pointer_cache_traits::find (db_, id)); if (!pointer_traits::null_ptr (p)) current (p, false); // Pointer from cache should not be guarded. @@ -26,7 +25,7 @@ namespace odb p = object_traits::create (); typename object_traits::pointer_cache_traits::insert_guard ig ( - object_traits::pointer_cache_traits::insert (database (), id, p)); + object_traits::pointer_cache_traits::insert (db_, id, p)); object_type& obj (pointer_traits::get_ref (p)); current (p); @@ -50,7 +49,7 @@ namespace odb typename object_traits::reference_cache_traits::insert_guard ig ( object_traits::reference_cache_traits::insert ( - res_->database (), res_->load_id (), obj)); + res_->db_, res_->load_id (), obj)); res_->load (obj, false); ig.release (); } -- cgit v1.1