From 48bd6a6b6585fde8839697294e14079da2d86962 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/mysql/database.hxx | 10 +++++-----
 odb/mysql/database.ixx | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/odb/mysql/database.hxx b/odb/mysql/database.hxx
index 6d1ee3a..886167d 100644
--- a/odb/mysql/database.hxx
+++ b/odb/mysql/database.hxx
@@ -382,7 +382,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>
@@ -394,7 +394,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>
@@ -406,7 +406,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>
@@ -418,7 +418,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 mysql::query_base&);
 
       template <typename T>
@@ -430,7 +430,7 @@ namespace odb
       query_value (const mysql::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/mysql/database.ixx b/odb/mysql/database.ixx
index 4fe1e15..9e18ff7 100644
--- a/odb/mysql/database.ixx
+++ b/odb/mysql/database.ixx
@@ -441,7 +441,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> (mysql::query_base ());
@@ -462,7 +462,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> (mysql::query_base (q));
@@ -483,7 +483,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> (mysql::query_base (q));
@@ -504,7 +504,7 @@ namespace odb
     }
 
     template <typename T>
-    inline typename object_traits<T>::pointer_type database::
+    inline typename result<T>::pointer_type database::
     query_one (const mysql::query_base& q)
     {
       // T is always object_type. We also don't need to check for transaction
@@ -534,7 +534,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