Support for C++11 std::shared_ptr/weak_ptr as object pointers

This includes odb::lazy_shared_ptr and odb::lazy_weak_ptr implementations.

1 files changed, 62 insertions, 0 deletions

diff --git a/odb/lazy-ptr-impl.ixx b/odb/lazy-ptr-impl.ixx
index ac11d59..cd49682 100644
--- a/odb/lazy-ptr-impl.ixx
+++ b/odb/lazy-ptr-impl.ixx
@@ -28,6 +28,32 @@ namespace odb
   {
   }
 
+#ifdef ODB_CXX11
+  inline lazy_ptr_base::
+  lazy_ptr_base (lazy_ptr_base&& r)
+      : id_ (r.id_), db_ (r.db_), free_ (r.free_), copy_ (r.copy_)
+  {
+    r.id_ = 0;
+  }
+
+  inline lazy_ptr_base& lazy_ptr_base::
+  operator= (lazy_ptr_base&& r)
+  {
+    if (id_ != r.id_)
+    {
+      reset_id ();
+      id_ = r.id_;
+      db_ = r.db_;
+      free_ = r.free_;
+      copy_ = r.copy_;
+
+      r.id_ = 0;
+    }
+
+    return *this;
+  }
+#endif
+
   inline void lazy_ptr_base::
   reset_id ()
   {
@@ -214,6 +240,42 @@ namespace odb
     return *this;
   }
 
+#ifdef ODB_CXX11
+  template <typename T>
+  inline lazy_ptr_impl<T>::
+  lazy_ptr_impl (lazy_ptr_impl&& r)
+      : lazy_ptr_base (std::move (r))
+  {
+  }
+
+  template <typename T>
+  template <typename Y>
+  inline lazy_ptr_impl<T>::
+  lazy_ptr_impl (lazy_ptr_impl<Y>&& r)
+      : lazy_ptr_base (std::move (r))
+  {
+  }
+
+  template <typename T>
+  inline lazy_ptr_impl<T>& lazy_ptr_impl<T>::
+  operator= (lazy_ptr_impl&& r)
+  {
+    lazy_ptr_base& b (*this);
+    b = std::move (r);
+    return *this;
+  }
+
+  template <typename T>
+  template <typename Y>
+  inline lazy_ptr_impl<T>& lazy_ptr_impl<T>::
+  operator= (lazy_ptr_impl<Y>&& r)
+  {
+    lazy_ptr_base& b (*this);
+    b = std::move (r);
+    return *this;
+  }
+#endif
+
   template <typename T>
   template <typename ID>
   inline void lazy_ptr_impl<T>::