aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-03-27 16:30:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-03-27 16:30:36 +0200
commitee4d942916d347ac65f53969941b0fb100760611 (patch)
tree02e165f85df32f2e8314cd29868b92fcc0fae00d
parentb119086e8c5835695cd851da8ad1393218aa29df (diff)
Get pointer_type from correct traits (object, view), part 2
-rw-r--r--odb/database.hxx10
-rw-r--r--odb/database.ixx10
2 files changed, 10 insertions, 10 deletions
diff --git a/odb/database.hxx b/odb/database.hxx
index 1c44745..8ee5c55 100644
--- a/odb/database.hxx
+++ b/odb/database.hxx
@@ -277,7 +277,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>
@@ -289,7 +289,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>
@@ -301,7 +301,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>
@@ -313,7 +313,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 odb::query<T>&);
template <typename T>
@@ -594,7 +594,7 @@ namespace odb
erase_object_ (I, I, bool);
template <typename T, database_id DB, typename Q>
- typename object_traits<T>::pointer_type
+ typename result<T>::pointer_type
query_one_ (const Q&);
template <typename T, database_id DB, typename Q>
diff --git a/odb/database.ixx b/odb/database.ixx
index 2b32c63..2fd54c0 100644
--- a/odb/database.ixx
+++ b/odb/database.ixx
@@ -571,7 +571,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> (odb::query<T> ());
@@ -592,7 +592,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> (odb::query<T> (q));
@@ -613,7 +613,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> (odb::query<T> (q));
@@ -641,7 +641,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<T>& q)
{
return query_one_<T, id_common> (q);
@@ -823,7 +823,7 @@ namespace odb
}
template <typename T, database_id DB, typename Q>
- inline typename object_traits<T>::pointer_type database::
+ inline typename result<T>::pointer_type database::
query_one_ (const Q& q)
{
result<T> r (query_<T, DB>::call (*this, q));