From 89ceaaf470d19d475d665b87a1fbe66009d0912b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Mar 2012 12:34:41 +0200 Subject: Add support for using C++11 std::unique_ptr to pass connection factory --- odb/sqlite/database.cxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'odb/sqlite/database.cxx') diff --git a/odb/sqlite/database.cxx b/odb/sqlite/database.cxx index 6bd3636..cd62a1c 100644 --- a/odb/sqlite/database.cxx +++ b/odb/sqlite/database.cxx @@ -18,6 +18,8 @@ namespace odb { namespace sqlite { + using odb::details::transfer_ptr; + database:: ~database () { @@ -27,11 +29,11 @@ namespace odb database (const string& name, int flags, bool foreign_keys, - auto_ptr factory) + transfer_ptr factory) : name_ (name), flags_ (flags), foreign_keys_ (foreign_keys), - factory_ (factory) + factory_ (factory.transfer ()) { if (factory_.get () == 0) factory_.reset (new connection_pool_factory ()); @@ -45,8 +47,10 @@ namespace odb bool erase, int flags, bool foreign_keys, - std::auto_ptr factory) - : flags_ (flags), foreign_keys_ (foreign_keys), factory_ (factory) + transfer_ptr factory) + : flags_ (flags), + foreign_keys_ (foreign_keys), + factory_ (factory.transfer ()) { using namespace details; -- cgit v1.1