aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-03-27 16:30:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-03-27 16:30:37 +0200
commit449f9abcba8c829950f8f8450c45de8d4c927811 (patch)
tree6d32f2c7add4cd481bb13d4110353964cc4eb1a8
parent4e94f508319aea60078c02a9c55ff1e050fb7025 (diff)
Get pointer_type from correct traits (object, view), part 2
-rw-r--r--odb/oracle/database.hxx10
-rw-r--r--odb/oracle/database.ixx10
2 files changed, 10 insertions, 10 deletions
diff --git a/odb/oracle/database.hxx b/odb/oracle/database.hxx
index 2c7c2f5..5534800 100644
--- a/odb/oracle/database.hxx
+++ b/odb/oracle/database.hxx
@@ -324,7 +324,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>
@@ -336,7 +336,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>
@@ -348,7 +348,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>
@@ -360,7 +360,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 oracle::query_base&);
template <typename T>
@@ -372,7 +372,7 @@ namespace odb
query_value (const oracle::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/oracle/database.ixx b/odb/oracle/database.ixx
index 621f3de..24f435a 100644
--- a/odb/oracle/database.ixx
+++ b/odb/oracle/database.ixx
@@ -464,7 +464,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> (oracle::query_base ());
@@ -485,7 +485,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> (oracle::query_base (q));
@@ -506,7 +506,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> (oracle::query_base (q));
@@ -527,7 +527,7 @@ namespace odb
}
template <typename T>
- inline typename object_traits<T>::pointer_type database::
+ inline typename result<T>::pointer_type database::
query_one (const oracle::query_base& q)
{
// T is always object_type. We also don't need to check for transaction
@@ -557,7 +557,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.