diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-01 12:34:41 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-01 12:34:41 +0200 |
| commit | 5f60d6859c6269b6a8fedbbf44973e8e9f28340c (patch) | |
| tree | 5dbad7a5394803146eacab5d0e73bb43d3d2c763 /odb/oracle/database.cxx | |
| parent | 2f26329e52cb5b312c8f0ba4da9264afdd78743a (diff) | |
Add support for using C++11 std::unique_ptr to pass connection factory
Diffstat (limited to 'odb/oracle/database.cxx')
| -rw-r--r-- | odb/oracle/database.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/odb/oracle/database.cxx b/odb/oracle/database.cxx index 9a0c4d7..a8abb53 100644 --- a/odb/oracle/database.cxx +++ b/odb/oracle/database.cxx @@ -18,6 +18,8 @@ namespace odb { namespace oracle { + using odb::details::transfer_ptr; + database:: database (const string& user, const string& password, @@ -25,7 +27,7 @@ namespace odb ub2 charset, ub2 ncharset, OCIEnv* environment, - auto_ptr<connection_factory> factory) + transfer_ptr<connection_factory> factory) : user_ (user), password_ (password), db_ (db), @@ -33,7 +35,7 @@ namespace odb charset_ (charset), ncharset_ (ncharset_), environment_ (environment), - factory_ (factory) + factory_ (factory.transfer ()) { if (environment_ == 0) { @@ -64,7 +66,7 @@ namespace odb ub2 charset, ub2 ncharset, OCIEnv* environment, - auto_ptr<connection_factory> factory) + transfer_ptr<connection_factory> factory) : user_ (user), password_ (password), service_ (service), @@ -73,7 +75,7 @@ namespace odb charset_ (charset), ncharset_ (ncharset), environment_ (environment), - factory_ (factory) + factory_ (factory.transfer ()) { if (environment_ == 0) { @@ -122,12 +124,12 @@ namespace odb ub2 charset, ub2 ncharset, OCIEnv* environment, - auto_ptr<connection_factory> factory) + transfer_ptr<connection_factory> factory) : port_ (0), charset_ (charset), ncharset_ (ncharset), environment_ (environment), - factory_ (factory) + factory_ (factory.transfer ()) { if (environment_ == 0) { |