From 4e7d12d30a3863f89f1deba05d1ae5fb52cb1a80 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 29 Oct 2012 10:08:30 +0200
Subject: 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.
---
 odb/boost/smart-ptr/lazy-ptr.hxx | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'odb/boost/smart-ptr/lazy-ptr.hxx')

diff --git a/odb/boost/smart-ptr/lazy-ptr.hxx b/odb/boost/smart-ptr/lazy-ptr.hxx
index 8e6c628..0d9cf56 100644
--- a/odb/boost/smart-ptr/lazy-ptr.hxx
+++ b/odb/boost/smart-ptr/lazy-ptr.hxx
@@ -98,20 +98,20 @@ namespace odb
       //
       void unload () const;
 
-      template <class ID> lazy_shared_ptr (database_type&, const ID&);
-      template <class Y> lazy_shared_ptr (database_type&, Y*);
-      template <class Y, class D> lazy_shared_ptr (database_type&, Y*, D);
-      template <class Y, class D, class A> lazy_shared_ptr (database_type&, Y*, D, A);
-      template <class Y> lazy_shared_ptr (database_type&, std::auto_ptr<Y>&);
-      template <class Y> lazy_shared_ptr (database_type&, const ::boost::shared_ptr<Y>&);
-      template <class Y> lazy_shared_ptr (database_type&, const ::boost::weak_ptr<Y>&);
-
-      template <class ID> void reset (database_type&, const ID&);
-      template <class Y> void reset (database_type&, Y*);
-      template <class Y, class D> void reset (database_type&, Y*, D);
-      template <class Y, class D, class A> void reset (database_type&, Y*, D, A);
-      template <class Y> void reset (database_type&, std::auto_ptr<Y>&);
-      template <class Y> void reset (database_type&, const ::boost::shared_ptr<Y>&);
+      template <class DB, class ID> lazy_shared_ptr (DB&, const ID&);
+      template <class DB, class Y> lazy_shared_ptr (DB&, Y*);
+      template <class DB, class Y, class D> lazy_shared_ptr (DB&, Y*, D);
+      template <class DB, class Y, class D, class A> lazy_shared_ptr (DB&, Y*, D, A);
+      template <class DB, class Y> lazy_shared_ptr (DB&, std::auto_ptr<Y>&);
+      template <class DB, class Y> lazy_shared_ptr (DB&, const ::boost::shared_ptr<Y>&);
+      template <class DB, class Y> lazy_shared_ptr (DB&, const ::boost::weak_ptr<Y>&);
+
+      template <class DB, class ID> void reset (DB&, const ID&);
+      template <class DB, class Y> void reset (DB&, Y*);
+      template <class DB, class Y, class D> void reset (DB&, Y*, D);
+      template <class DB, class Y, class D, class A> void reset (DB&, Y*, D, A);
+      template <class DB, class Y> void reset (DB&, std::auto_ptr<Y>&);
+      template <class DB, class Y> void reset (DB&, const ::boost::shared_ptr<Y>&);
 
 #ifdef ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT
       template <class O = T>
@@ -209,13 +209,13 @@ namespace odb
       //
       void unload () const;
 
-      template <class ID> lazy_weak_ptr (database_type&, const ID&);
-      template <class Y> lazy_weak_ptr (database_type&, const ::boost::shared_ptr<Y>&);
-      template <class Y> lazy_weak_ptr (database_type&, const ::boost::weak_ptr<Y>&);
+      template <class DB, class ID> lazy_weak_ptr (DB&, const ID&);
+      template <class DB, class Y> lazy_weak_ptr (DB&, const ::boost::shared_ptr<Y>&);
+      template <class DB, class Y> lazy_weak_ptr (DB&, const ::boost::weak_ptr<Y>&);
 
-      template <class ID> void reset (database_type&, const ID&);
-      template <class Y> void reset (database_type&, const ::boost::shared_ptr<Y>&);
-      template <class Y> void reset (database_type&, const ::boost::weak_ptr<Y>&);
+      template <class DB, class ID> void reset (DB&, const ID&);
+      template <class DB, class Y> void reset (DB&, const ::boost::shared_ptr<Y>&);
+      template <class DB, class Y> void reset (DB&, const ::boost::weak_ptr<Y>&);
 
       // The object_id() function can only be called when the object is
       // persistent, or: expired() XOR loaded() (can use != for XOR).
-- 
cgit v1.1