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
commit4109a2a3f76ab35992c557bad81048d3fef5c409 (patch)
tree0149a55d1c03c46e1e5f431c3e58e00cf102a452
parent6d0a6fb0566d8270133ecda355f167124686f24f (diff)
Get pointer_type from correct traits (object, view), part 2
-rw-r--r--odb/mssql/database.hxx10
-rw-r--r--odb/mssql/database.ixx10
2 files changed, 10 insertions, 10 deletions
diff --git a/odb/mssql/database.hxx b/odb/mssql/database.hxx
index 246703b..d01ba30 100644
--- a/odb/mssql/database.hxx
+++ b/odb/mssql/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 mssql::query_base&);
template <typename T>
@@ -430,7 +430,7 @@ namespace odb
query_value (const mssql::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/mssql/database.ixx b/odb/mssql/database.ixx
index 3ab292e..6558339 100644
--- a/odb/mssql/database.ixx
+++ b/odb/mssql/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> (mssql::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> (mssql::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> (mssql::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 mssql::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.