Add static multi-database support for lazy pointers

A lazy pointer must load the object using the static database interface
with which it was initialized.

1 files changed, 49 insertions, 49 deletions

diff --git a/odb/boost/smart-ptr/lazy-ptr.ixx b/odb/boost/smart-ptr/lazy-ptr.ixx
index 4b9f761..a9d8e4d 100644
--- a/odb/boost/smart-ptr/lazy-ptr.ixx
+++ b/odb/boost/smart-ptr/lazy-ptr.ixx
@@ -221,140 +221,140 @@ namespace odb
     }
 
     template <class T>
-    template <class ID>
+    template <class DB, class ID>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, const ID& id): i_ (db, id) {}
+    lazy_shared_ptr (DB& db, const ID& id): i_ (db, id) {}
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, Y* p)
+    lazy_shared_ptr (DB& db, Y* p)
         : p_ (p)
     {
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
     }
 
     template <class T>
-    template <class Y, class D>
+    template <class DB, class Y, class D>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, Y* p, D d)
+    lazy_shared_ptr (DB& db, Y* p, D d)
         : p_ (p, d)
     {
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
     }
 
     template <class T>
-    template <class Y, class D, class A>
+    template <class DB, class Y, class D, class A>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, Y* p, D d, A a)
+    lazy_shared_ptr (DB& db, Y* p, D d, A a)
         : p_ (p, d, a)
     {
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, std::auto_ptr<Y>& r)
+    lazy_shared_ptr (DB& db, std::auto_ptr<Y>& r)
         : p_ (r)
     {
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, const ::boost::shared_ptr<Y>& r)
+    lazy_shared_ptr (DB& db, const ::boost::shared_ptr<Y>& r)
         : p_ (r)
     {
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline lazy_shared_ptr<T>::
-    lazy_shared_ptr (database_type& db, const ::boost::weak_ptr<Y>& r)
+    lazy_shared_ptr (DB& db, const ::boost::weak_ptr<Y>& r)
         : p_ (r)
     {
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
     }
 
     template <class T>
-    template <class ID>
+    template <class DB, class ID>
     inline void lazy_shared_ptr<T>::
-    reset (database_type& db, const ID& id)
+    reset (DB& db, const ID& id)
     {
       p_.reset ();
       i_.reset (db, id);
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline void lazy_shared_ptr<T>::
-    reset (database_type& db, Y* p)
+    reset (DB& db, Y* p)
     {
       p_.reset (p);
 
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
       else
         i_.reset ();
     }
 
     template <class T>
-    template <class Y, class D>
+    template <class DB, class Y, class D>
     inline void lazy_shared_ptr<T>::
-    reset (database_type& db, Y* p, D d)
+    reset (DB& db, Y* p, D d)
     {
       p_.reset (p, d);
 
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
       else
         i_.reset ();
     }
 
     template <class T>
-    template <class Y, class D, class A>
+    template <class DB, class Y, class D, class A>
     inline void lazy_shared_ptr<T>::
-    reset (database_type& db, Y* p, D d, A a)
+    reset (DB& db, Y* p, D d, A a)
     {
       p_.reset (p, d, a);
 
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
       else
         i_.reset ();
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline void lazy_shared_ptr<T>::
-    reset (database_type& db, std::auto_ptr<Y>& r)
+    reset (DB& db, std::auto_ptr<Y>& r)
     {
       p_ = r;
 
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
       else
         i_.reset ();
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline void lazy_shared_ptr<T>::
-    reset (database_type& db, const ::boost::shared_ptr<Y>& r)
+    reset (DB& db, const ::boost::shared_ptr<Y>& r)
     {
       p_ = r;
 
       if (p_)
-        i_.reset (db);
+        i_.reset_db (db);
       else
         i_.reset ();
     }
@@ -554,14 +554,14 @@ namespace odb
     }
 
     template <class T>
-    template <class ID>
+    template <class DB, class ID>
     inline lazy_weak_ptr<T>::
-    lazy_weak_ptr (database_type& db, const ID& id): i_ (db, id) {}
+    lazy_weak_ptr (DB& db, const ID& id): i_ (db, id) {}
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline lazy_weak_ptr<T>::
-    lazy_weak_ptr (database_type& db, const ::boost::shared_ptr<Y>& r)
+    lazy_weak_ptr (DB& db, const ::boost::shared_ptr<Y>& r)
         : p_ (r)
     {
       typedef typename object_traits<T>::object_type object_type;
@@ -571,9 +571,9 @@ namespace odb
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline lazy_weak_ptr<T>::
-    lazy_weak_ptr (database_type& db, const ::boost::weak_ptr<Y>& r)
+    lazy_weak_ptr (DB& db, const ::boost::weak_ptr<Y>& r)
         : p_ (r)
     {
       typedef typename object_traits<T>::object_type object_type;
@@ -585,18 +585,18 @@ namespace odb
     }
 
     template <class T>
-    template <class ID>
+    template <class DB, class ID>
     inline void lazy_weak_ptr<T>::
-    reset (database_type& db, const ID& id)
+    reset (DB& db, const ID& id)
     {
       p_.reset ();
       i_.reset (db, id);
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline void lazy_weak_ptr<T>::
-    reset (database_type& db, const ::boost::shared_ptr<Y>& r)
+    reset (DB& db, const ::boost::shared_ptr<Y>& r)
     {
       typedef typename object_traits<T>::object_type object_type;
 
@@ -609,9 +609,9 @@ namespace odb
     }
 
     template <class T>
-    template <class Y>
+    template <class DB, class Y>
     inline void lazy_weak_ptr<T>::
-    reset (database_type& db, const ::boost::weak_ptr<Y>& r)
+    reset (DB& db, const ::boost::weak_ptr<Y>& r)
     {
       typedef typename object_traits<T>::object_type object_type;