diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-06-15 18:50:51 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-06-15 18:50:51 +0200 |
commit | 13dd928ae18ef9610bc820b7b3e65629addea1d2 (patch) | |
tree | d9ee8ef03e3ee5a3be9925de08537b03cf29320b /odb/connection.ixx | |
parent | b33321c4d05c0ac759bf3fcf647a568af8bfca0c (diff) |
Get rid of C++11 deprecation warnings for auto_ptr, exception specs
In particular, std::auto_ptr is no longer mapped in C++11.
Diffstat (limited to 'odb/connection.ixx')
-rw-r--r-- | odb/connection.ixx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odb/connection.ixx b/odb/connection.ixx index e86f8d8..1ed64bb 100644 --- a/odb/connection.ixx +++ b/odb/connection.ixx @@ -64,24 +64,24 @@ namespace odb cache_query_ (pq.impl_, typeid (T), 0, 0, 0); } +#ifdef ODB_CXX11 template <typename T, typename P> inline void connection:: - cache_query (const prepared_query<T>& pq, std::auto_ptr<P> params) + cache_query (const prepared_query<T>& pq, std::unique_ptr<P> params) { assert (pq); - assert (params.get () != 0); + assert (params); cache_query_ ( pq.impl_, typeid (T), params.get (), &typeid (P), ¶ms_deleter<P>); params.release (); } - -#ifdef ODB_CXX11 +#else template <typename T, typename P> inline void connection:: - cache_query (const prepared_query<T>& pq, std::unique_ptr<P> params) + cache_query (const prepared_query<T>& pq, std::auto_ptr<P> params) { assert (pq); - assert (params); + assert (params.get () != 0); cache_query_ ( pq.impl_, typeid (T), params.get (), &typeid (P), ¶ms_deleter<P>); params.release (); |