aboutsummaryrefslogtreecommitdiff
path: root/odb/simple-object-result.txx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-10-15 13:17:30 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-10-19 11:38:24 +0200
commit1e78bdc724e95898c04a3409b0b192aa7f77780b (patch)
treed26ae47ae9956612b5973f536219f0c9b455db03 /odb/simple-object-result.txx
parent5b0430fdf4617b396e462872d438a663b174a3a8 (diff)
Implement early connection release
Diffstat (limited to 'odb/simple-object-result.txx')
-rw-r--r--odb/simple-object-result.txx7
1 files changed, 3 insertions, 4 deletions
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 ();
}