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/details/transfer-ptr.hxx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'odb/details/transfer-ptr.hxx')

diff --git a/odb/details/transfer-ptr.hxx b/odb/details/transfer-ptr.hxx
index 13f113e..0e2d726 100644
--- a/odb/details/transfer-ptr.hxx
+++ b/odb/details/transfer-ptr.hxx
@@ -23,10 +23,22 @@ namespace odb
 
       transfer_ptr (): p_ (0) {}
 
+#ifndef ODB_CXX11
       template <typename T1>
       transfer_ptr (std::auto_ptr<T1> p): p_ (p.release ()) {}
 
-#ifdef ODB_CXX11
+    private:
+      transfer_ptr& operator= (const transfer_ptr&);
+
+    public:
+      // In our usage transfer_ptr is always created implicitly and
+      // never const. So while this is not very clean, it is legal.
+      // Plus it will all go away once we drop C++98 (I can hardly
+      // wait).
+      //
+      transfer_ptr (const transfer_ptr& p)
+          : p_ (const_cast<transfer_ptr&> (p).transfer ()) {}
+#else
 #ifdef ODB_CXX11_NULLPTR
       transfer_ptr (std::nullptr_t): p_ (0) {}
 #endif
@@ -39,18 +51,6 @@ namespace odb
 
     public:
       transfer_ptr (transfer_ptr&& p): p_ (p.transfer ()) {}
-#else
-    private:
-      transfer_ptr& operator= (const transfer_ptr&);
-
-    public:
-      // In our usage transfer_ptr is always created implicitly and
-      // never const. So while this is not very clean, it is legal.
-      // Plus it will all go away once we drop C++98 (I can hardly
-      // wait).
-      //
-      transfer_ptr (const transfer_ptr& p)
-          : p_ (const_cast<transfer_ptr&> (p).transfer ()) {}
 #endif
 
       ~transfer_ptr () {delete p_;}
-- 
cgit v1.1