From 13dd928ae18ef9610bc820b7b3e65629addea1d2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 15 Jun 2016 18:50:51 +0200
Subject: Get rid of C++11 deprecation warnings for auto_ptr, exception specs

In particular, std::auto_ptr is no longer mapped in C++11.
---
 odb/connection.ixx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'odb/connection.ixx')

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), &params_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), &params_deleter<P>);
     params.release ();
-- 
cgit v1.1