aboutsummaryrefslogtreecommitdiff
path: root/evolution/soft-delete
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-06-15 18:50:51 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-06-15 18:50:51 +0200
commit72f9ee644d3a048e68ba9570a096b6dd12c5ee1a (patch)
tree5670eaa8c20845b401c0b09bd0d643b971c675d9 /evolution/soft-delete
parent766b7533addb5c981b135640321c291be270d907 (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 'evolution/soft-delete')
-rw-r--r--evolution/soft-delete/model.hxx8
1 files changed, 7 insertions, 1 deletions
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;
};