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/database.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/database.ixx')
| -rw-r--r-- | odb/database.ixx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odb/database.ixx b/odb/database.ixx index 1ea7949..47d4d70 100644 --- a/odb/database.ixx +++ b/odb/database.ixx @@ -687,21 +687,21 @@ namespace odb c.cache_query (pq); } +#ifdef ODB_CXX11 template <typename T, typename P> inline void database:: - cache_query (const prepared_query<T>& pq, std::auto_ptr<P> params) + cache_query (const prepared_query<T>& pq, std::unique_ptr<P> params) { connection_type& c (transaction::current ().connection ()); - c.cache_query (pq, params); + c.cache_query (pq, std::move (params)); } - -#ifdef ODB_CXX11 +#else template <typename T, typename P> inline void database:: - cache_query (const prepared_query<T>& pq, std::unique_ptr<P> params) + cache_query (const prepared_query<T>& pq, std::auto_ptr<P> params) { connection_type& c (transaction::current ().connection ()); - c.cache_query (pq, std::move (params)); + c.cache_query (pq, params); } #endif |