diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-14 11:27:35 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-14 11:27:35 +0200 |
commit | 8ceee297981402eb5331f357b27ebfac11706ec4 (patch) | |
tree | bb4d5d26bb450a3f0f0e499360f90d900b557521 /odb/tr1/lazy-ptr.txx | |
parent | 9bf4ff12e6d96870fa48785846de5c96411ec5ea (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/tr1/lazy-ptr.txx')
-rw-r--r-- | odb/tr1/lazy-ptr.txx | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/odb/tr1/lazy-ptr.txx b/odb/tr1/lazy-ptr.txx index 1f39aec..2fbacb7 100644 --- a/odb/tr1/lazy-ptr.txx +++ b/odb/tr1/lazy-ptr.txx @@ -40,32 +40,5 @@ namespace odb return i_.database () == r.i_.database () && object_id<object_type1> () == r.template object_id<object_type2> (); } - - // - // lazy_weak_ptr - // - - template <class T> - lazy_shared_ptr<T> lazy_weak_ptr<T>:: - lock () const - { - std::tr1::shared_ptr<T> sp (p_.lock ()); - - if (sp) - { - if (database_type* db = i_.database ()) - return lazy_shared_ptr<T> (*db, sp); - else - return lazy_shared_ptr<T> (sp); - } - else - { - if (i_) - return lazy_shared_ptr<T> ( - *i_.database (), i_.template object_id<T> ()); - else - return lazy_shared_ptr<T> (); - } - } } } |