aboutsummaryrefslogtreecommitdiff
path: root/odb/lazy-ptr.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-08-14 11:27:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-08-14 11:27:35 +0200
commit8ceee297981402eb5331f357b27ebfac11706ec4 (patch)
treebb4d5d26bb450a3f0f0e499360f90d900b557521 /odb/lazy-ptr.hxx
parent9bf4ff12e6d96870fa48785846de5c96411ec5ea (diff)
Reimplement lazy_weak_ptr lock() to preserve database type
Now we initialize the returned lazy_shared_ptr with the same loader function as the one set for weak_ptr.
Diffstat (limited to 'odb/lazy-ptr.hxx')
-rw-r--r--odb/lazy-ptr.hxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/odb/lazy-ptr.hxx b/odb/lazy-ptr.hxx
index 5e099aa..ccc6c3c 100644
--- a/odb/lazy-ptr.hxx
+++ b/odb/lazy-ptr.hxx
@@ -519,6 +519,12 @@ namespace odb
template <class Y> friend class lazy_shared_ptr;
template <class Y> friend class lazy_weak_ptr;
+ // For lazy_weak_ptr::lock().
+ //
+ lazy_shared_ptr (std::shared_ptr<T>&& p, const lazy_ptr_impl<T>& i)
+ : p_ (std::move (p)), i_ (i) {}
+
+ private:
mutable std::shared_ptr<T> p_;
mutable lazy_ptr_impl<T> i_;
};