aboutsummaryrefslogtreecommitdiff
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
commit8f278506a9ef4de0f17bdce5b69b212140f94ec0 (patch)
treea426156ae515da4a76b24920ea6273973486ebf0
parentb4a5f3e816da59372fd1400960229473cba30032 (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.
-rw-r--r--odb/qt/date-time/exceptions.cxx2
-rw-r--r--odb/qt/date-time/exceptions.hxx4
-rw-r--r--odb/qt/exception.hxx3
3 files changed, 6 insertions, 3 deletions
diff --git a/odb/qt/date-time/exceptions.cxx b/odb/qt/date-time/exceptions.cxx
index 43cba1f..dfc3efa 100644
--- a/odb/qt/date-time/exceptions.cxx
+++ b/odb/qt/date-time/exceptions.cxx
@@ -11,7 +11,7 @@ namespace odb
namespace date_time
{
const char* value_out_of_range::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "date/time value out of range";
}
diff --git a/odb/qt/date-time/exceptions.hxx b/odb/qt/date-time/exceptions.hxx
index e231bb6..d7dcb38 100644
--- a/odb/qt/date-time/exceptions.hxx
+++ b/odb/qt/date-time/exceptions.hxx
@@ -7,6 +7,8 @@
#include <odb/pre.hxx>
+#include <odb/details/config.hxx> // ODB_NOTHROW_NOEXCEPT
+
#include <odb/qt/exception.hxx>
#include <odb/qt/details/export.hxx>
@@ -19,7 +21,7 @@ namespace odb
struct LIBODB_QT_EXPORT value_out_of_range: exception
{
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual value_out_of_range*
clone () const;
diff --git a/odb/qt/exception.hxx b/odb/qt/exception.hxx
index 89a0ec7..0604c72 100644
--- a/odb/qt/exception.hxx
+++ b/odb/qt/exception.hxx
@@ -9,6 +9,7 @@
#include <odb/exceptions.hxx>
+#include <odb/details/config.hxx> // ODB_NOTHROW_NOEXCEPT
#include <odb/qt/details/export.hxx>
namespace odb
@@ -18,7 +19,7 @@ namespace odb
struct LIBODB_QT_EXPORT exception: odb::exception
{
virtual const char*
- what () const throw () = 0;
+ what () const ODB_NOTHROW_NOEXCEPT = 0;
};
}
}