aboutsummaryrefslogtreecommitdiff
path: root/odb/database.txx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-08-10 13:16:47 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-08-10 13:16:47 +0200
commit9bafeadb554fd4dfc11ce5c2b036a937008455f9 (patch)
tree7dfee55101ec7cc98684a1bfdd90a4356dccac34 /odb/database.txx
parent677d07f365c15ed62cbceb0990122c652e5751ec (diff)
Make result copy-assignable
Return result from database::query instead of pointer to impl
Diffstat (limited to 'odb/database.txx')
-rw-r--r--odb/database.txx6
1 files changed, 3 insertions, 3 deletions
diff --git a/odb/database.txx b/odb/database.txx
index 7440127..a120afa 100644
--- a/odb/database.txx
+++ b/odb/database.txx
@@ -94,21 +94,21 @@ namespace odb
}
template <typename T>
- shared_ptr<result_impl<T> > database::
+ result<T> database::
query ()
{
return query (odb::query<T> ());
}
template <typename T>
- shared_ptr<result_impl<T> > database::
+ result<T> database::
query (const std::string& q)
{
return query (odb::query<T> (q));
}
template <typename T>
- shared_ptr<result_impl<T> > database::
+ result<T> database::
query (const odb::query<T>& q)
{
if (!transaction::has_current ())