aboutsummaryrefslogtreecommitdiff
path: root/common/query
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 /common/query
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 'common/query')
-rw-r--r--common/query/basics/test.hxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/query/basics/test.hxx b/common/query/basics/test.hxx
index 3e61c57..74b5ff5 100644
--- a/common/query/basics/test.hxx
+++ b/common/query/basics/test.hxx
@@ -5,6 +5,8 @@
#ifndef TEST_HXX
#define TEST_HXX
+#include <common/config.hxx> // HAVE_CXX11
+
#include <string>
#include <vector>
#include <memory>
@@ -55,7 +57,11 @@ struct person
std::string first_name_;
#pragma db column ("middle") null
+#ifdef HAVE_CXX11
+ std::unique_ptr<std::string> middle_name_;
+#else
std::auto_ptr<std::string> middle_name_;
+#endif
#pragma db column ("last")
std::string last_name_;