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.

1 files changed, 7 insertions, 0 deletions

diff --git a/odb/tr1/lazy-ptr.hxx b/odb/tr1/lazy-ptr.hxx
index 4579090..1c5d8ca 100644
--- a/odb/tr1/lazy-ptr.hxx
+++ b/odb/tr1/lazy-ptr.hxx
@@ -134,6 +134,13 @@ 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 (const std::tr1::shared_ptr<T>& p,
+                       const lazy_ptr_impl<T>& i)
+          : p_ (p), i_ (i) {}
+
+    private:
       mutable std::tr1::shared_ptr<T> p_;
       mutable lazy_ptr_impl<T> i_;
     };