diff options
| -rw-r--r-- | odb/tr1/lazy-ptr.hxx | 6 | ||||
| -rw-r--r-- | odb/tr1/lazy-ptr.ixx | 39 |
2 files changed, 2 insertions, 43 deletions
diff --git a/odb/tr1/lazy-ptr.hxx b/odb/tr1/lazy-ptr.hxx index fade039..ad6e283 100644 --- a/odb/tr1/lazy-ptr.hxx +++ b/odb/tr1/lazy-ptr.hxx @@ -39,7 +39,6 @@ namespace odb lazy_shared_ptr (); template <class Y> explicit lazy_shared_ptr (Y*); template <class Y, class D> lazy_shared_ptr (Y*, D); - template <class Y, class D, class A> lazy_shared_ptr (Y*, D, A); lazy_shared_ptr (const lazy_shared_ptr&); template <class Y> lazy_shared_ptr (const lazy_shared_ptr<Y>&); @@ -56,7 +55,6 @@ namespace odb void reset (); template <class Y> void reset (Y*); template <class Y, class D> void reset (Y*, D); - template <class Y, class D, class A> void reset (Y*, D, A); T& operator* () const; T* operator-> () const; @@ -103,7 +101,6 @@ namespace odb 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 std::tr1::shared_ptr<Y>&); template <class Y> lazy_shared_ptr (database_type&, const std::tr1::weak_ptr<Y>&); @@ -111,8 +108,7 @@ namespace odb 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&, const std::auto_ptr<Y>&); + template <class Y> void reset (database_type&, std::auto_ptr<Y>&); template <class Y> void reset (database_type&, const std::tr1::shared_ptr<Y>&); #ifdef ODB_CXX11 diff --git a/odb/tr1/lazy-ptr.ixx b/odb/tr1/lazy-ptr.ixx index be78cd1..2fb76a9 100644 --- a/odb/tr1/lazy-ptr.ixx +++ b/odb/tr1/lazy-ptr.ixx @@ -25,11 +25,6 @@ namespace odb lazy_shared_ptr (Y* p, D d): p_ (p, d) {} template <class T> - template <class Y, class D, class A> - inline lazy_shared_ptr<T>:: - lazy_shared_ptr (Y* p, D d, A a): p_ (p, d, a) {} - - template <class T> inline lazy_shared_ptr<T>:: lazy_shared_ptr (const lazy_shared_ptr& r): p_ (r.p_), i_ (r.i_) {} @@ -124,15 +119,6 @@ namespace odb } template <class T> - template <class Y, class D, class A> - inline void lazy_shared_ptr<T>:: - reset (Y* p, D d, A a) - { - p_.reset (p, d, a); - i_.reset (); - } - - template <class T> inline T& lazy_shared_ptr<T>:: operator* () const { @@ -246,16 +232,6 @@ namespace odb } template <class T> - template <class Y, class D, class A> - inline lazy_shared_ptr<T>:: - lazy_shared_ptr (database_type& db, Y* p, D d, A a) - : p_ (p, d, a) - { - if (p_) - i_.reset (db); - } - - template <class T> template <class Y> inline lazy_shared_ptr<T>:: lazy_shared_ptr (database_type& db, std::auto_ptr<Y>& r) @@ -321,22 +297,9 @@ namespace odb } template <class T> - template <class Y, class D, class A> - inline void lazy_shared_ptr<T>:: - reset (database_type& db, Y* p, D d, A a) - { - p_.reset (p, d, a); - - if (p_) - i_.reset (db); - else - i_.reset (); - } - - template <class T> template <class Y> inline void lazy_shared_ptr<T>:: - reset (database_type& db, const std::auto_ptr<Y>& r) + reset (database_type& db, std::auto_ptr<Y>& r) { p_ = r; |