From 9c275a93cec797a021571ba8545906e0b4ffbfbc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 5 Sep 2011 10:20:47 +0200
Subject: Support for views; native part

---
 odb/database.ixx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'odb/database.ixx')

diff --git a/odb/database.ixx b/odb/database.ixx
index dbdcaec..c4b3c77 100644
--- a/odb/database.ixx
+++ b/odb/database.ixx
@@ -200,33 +200,33 @@ namespace odb
   inline result<T> database::
   query (bool cache)
   {
-    // T can be const T while object_type will always be T.
+    // T can be const T.
     //
-    typedef typename odb::object_traits<T>::object_type object_type;
+    typedef typename details::meta::remove_const<T>::result type;
 
-    return query<T> (odb::query<object_type> (), cache);
+    return query<T> (odb::query<type> (), cache);
   }
 
   template <typename T>
   inline result<T> database::
   query (const char* q, bool cache)
   {
-    // T can be const T while object_type will always be T.
+    // T can be const T.
     //
-    typedef typename odb::object_traits<T>::object_type object_type;
+    typedef typename details::meta::remove_const<T>::result type;
 
-    return query<T> (odb::query<object_type> (q), cache);
+    return query<T> (odb::query<type> (q), cache);
   }
 
   template <typename T>
   inline result<T> database::
   query (const std::string& q, bool cache)
   {
-    // T can be const T while object_type will always be T.
+    // T can be const T.
     //
-    typedef typename odb::object_traits<T>::object_type object_type;
+    typedef typename details::meta::remove_const<T>::result type;
 
-    return query<T> (odb::query<object_type> (q), cache);
+    return query<T> (odb::query<type> (q), cache);
   }
 
   inline unsigned long long database::
-- 
cgit v1.1