From c89d2d34e27f674720c3c497bbd18a26a5bf9f38 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 4 Jul 2011 17:53:47 +0200
Subject: Implement support for database operations callbacks

New object pragma: callback. New test: common/callback. New manual
section: 10.1.4, "callback".
---
 odb/database.ixx | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'odb/database.ixx')

diff --git a/odb/database.ixx b/odb/database.ixx
index 252f866..bd3fb44 100644
--- a/odb/database.ixx
+++ b/odb/database.ixx
@@ -104,18 +104,6 @@ namespace odb
 
   template <typename T>
   inline void database::
-  erase (T& obj)
-  {
-    // T can be const T while object_type will always be T.
-    //
-    typedef typename odb::object_traits<T>::object_type object_type;
-    typedef odb::object_traits<object_type> object_traits;
-
-    erase<T> (object_traits::id (obj));
-  }
-
-  template <typename T>
-  inline void database::
   erase (T* p)
   {
     typedef typename object_traits<T>::pointer_type object_pointer;
@@ -163,15 +151,10 @@ namespace odb
   inline void database::
   erase_ (const typename object_traits<T>::pointer_type& pobj)
   {
-    // T can be const T while object_type will always be T.
-    //
-    typedef typename odb::object_traits<T>::object_type object_type;
-    typedef odb::object_traits<object_type> object_traits;
-
-    typedef typename odb::object_traits<T>::pointer_type pointer_type;
-    typedef odb::pointer_traits<pointer_type> pointer_traits;
+    typedef typename object_traits<T>::pointer_type pointer_type;
+    typedef pointer_traits<pointer_type> pointer_traits;
 
-    erase<T> (object_traits::id (pointer_traits::get_ref (pobj)));
+    erase<T> (pointer_traits::get_ref (pobj));
   }
 
   template <typename T>
-- 
cgit v1.1