From 8f278506a9ef4de0f17bdce5b69b212140f94ec0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov 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/qt/date-time/exceptions.cxx | 2 +- odb/qt/date-time/exceptions.hxx | 4 +++- odb/qt/exception.hxx | 3 ++- 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 +#include // ODB_NOTHROW_NOEXCEPT + #include #include @@ -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 +#include // ODB_NOTHROW_NOEXCEPT #include 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; }; } } -- cgit v1.1