From 27a578709046a81bb0efc0027bfc74318615447e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 27 Mar 2015 16:30:36 +0200
Subject: Get pointer_type from correct traits (object, view), part 2

---
 odb/sqlite/database.hxx | 10 +++++-----
 odb/sqlite/database.ixx | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/odb/sqlite/database.hxx b/odb/sqlite/database.hxx
index 906d91b..f7f3994 100644
--- a/odb/sqlite/database.hxx
+++ b/odb/sqlite/database.hxx
@@ -326,7 +326,7 @@ namespace odb
       // Query one API.
       //
       template <typename T>
-      typename object_traits<T>::pointer_type
+      typename result<T>::pointer_type
       query_one ();
 
       template <typename T>
@@ -338,7 +338,7 @@ namespace odb
       query_value ();
 
       template <typename T>
-      typename object_traits<T>::pointer_type
+      typename result<T>::pointer_type
       query_one (const char*);
 
       template <typename T>
@@ -350,7 +350,7 @@ namespace odb
       query_value (const char*);
 
       template <typename T>
-      typename object_traits<T>::pointer_type
+      typename result<T>::pointer_type
       query_one (const std::string&);
 
       template <typename T>
@@ -362,7 +362,7 @@ namespace odb
       query_value (const std::string&);
 
       template <typename T>
-      typename object_traits<T>::pointer_type
+      typename result<T>::pointer_type
       query_one (const sqlite::query_base&);
 
       template <typename T>
@@ -374,7 +374,7 @@ namespace odb
       query_value (const sqlite::query_base&);
 
       template <typename T>
-      typename object_traits<T>::pointer_type
+      typename result<T>::pointer_type
       query_one (const odb::query_base&);
 
       template <typename T>
diff --git a/odb/sqlite/database.ixx b/odb/sqlite/database.ixx
index becf308..c1e8f07 100644
--- a/odb/sqlite/database.ixx
+++ b/odb/sqlite/database.ixx
@@ -436,7 +436,7 @@ namespace odb
     }
 
     template <typename T>
-    inline typename object_traits<T>::pointer_type database::
+    inline typename result<T>::pointer_type database::
     query_one ()
     {
       return query_one<T> (sqlite::query_base ());
@@ -457,7 +457,7 @@ namespace odb
     }
 
     template <typename T>
-    inline typename object_traits<T>::pointer_type database::
+    inline typename result<T>::pointer_type database::
     query_one (const char* q)
     {
       return query_one<T> (sqlite::query_base (q));
@@ -478,7 +478,7 @@ namespace odb
     }
 
     template <typename T>
-    inline typename object_traits<T>::pointer_type database::
+    inline typename result<T>::pointer_type database::
     query_one (const std::string& q)
     {
       return query_one<T> (sqlite::query_base (q));
@@ -499,7 +499,7 @@ namespace odb
     }
 
     template <typename T>
-    inline typename object_traits<T>::pointer_type database::
+    inline typename result<T>::pointer_type database::
     query_one (const sqlite::query_base& q)
     {
       // T is always object_type. We also don't need to check for transaction
@@ -529,7 +529,7 @@ namespace odb
     }
 
     template <typename T>
-    inline typename object_traits<T>::pointer_type database::
+    inline typename result<T>::pointer_type database::
     query_one (const odb::query_base& q)
     {
       // Translate to native query.
-- 
cgit v1.1