From 72f9ee644d3a048e68ba9570a096b6dd12c5ee1a 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.
---
evolution/soft-delete/model.hxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'evolution')
diff --git a/evolution/soft-delete/model.hxx b/evolution/soft-delete/model.hxx
index 825f969..99bc664 100644
--- a/evolution/soft-delete/model.hxx
+++ b/evolution/soft-delete/model.hxx
@@ -6,8 +6,10 @@
# error model.hxx included directly
#endif
+#include <common/config.hxx> // HAVE_CXX11
+
#include <string>
-#include <memory> // std::auto_ptr
+#include <memory> // std::auto_ptr/unique_ptr
#include <odb/core.hxx>
#include <odb/vector.hxx>
@@ -448,7 +450,11 @@ namespace MODEL_NAMESPACE(MODEL_VERSION)
#pragma db id
unsigned long id_;
+#ifdef HAVE_CXX11
+ std::unique_ptr<value> v;
+#else
std::auto_ptr<value> v;
+#endif
unsigned long num;
};
--
cgit v1.1