From 5e72f6ab51d81aa270c758dada394533fad2d0f9 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/pgsql/database.hxx | 1 - odb/pgsql/exceptions.cxx | 8 ++++---- odb/pgsql/exceptions.hxx | 9 +++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/odb/pgsql/database.hxx b/odb/pgsql/database.hxx index bf77397..28d333b 100644 --- a/odb/pgsql/database.hxx +++ b/odb/pgsql/database.hxx @@ -8,7 +8,6 @@ #include #include -#include // std::auto_ptr, std::unique_ptr #include // std::ostream #include diff --git a/odb/pgsql/exceptions.cxx b/odb/pgsql/exceptions.cxx index 115b9f8..beec784 100644 --- a/odb/pgsql/exceptions.cxx +++ b/odb/pgsql/exceptions.cxx @@ -31,12 +31,12 @@ namespace odb } database_exception:: - ~database_exception () throw () + ~database_exception () ODB_NOTHROW_NOEXCEPT { } const char* database_exception:: - what () const throw () + what () const ODB_NOTHROW_NOEXCEPT { return what_.c_str (); } @@ -58,12 +58,12 @@ namespace odb } cli_exception:: - ~cli_exception () throw () + ~cli_exception () ODB_NOTHROW_NOEXCEPT { } const char* cli_exception:: - what () const throw () + what () const ODB_NOTHROW_NOEXCEPT { return what_.c_str (); } diff --git a/odb/pgsql/exceptions.hxx b/odb/pgsql/exceptions.hxx index 0dbbda3..20e82af 100644 --- a/odb/pgsql/exceptions.hxx +++ b/odb/pgsql/exceptions.hxx @@ -10,6 +10,7 @@ #include #include +#include // ODB_NOTHROW_NOEXCEPT #include #include @@ -26,7 +27,7 @@ namespace odb database_exception (const std::string& sqlstate, const std::string& message); - ~database_exception () throw (); + ~database_exception () ODB_NOTHROW_NOEXCEPT; const std::string& message () const @@ -41,7 +42,7 @@ namespace odb } virtual const char* - what () const throw (); + what () const ODB_NOTHROW_NOEXCEPT; virtual database_exception* clone () const; @@ -55,10 +56,10 @@ namespace odb struct LIBODB_PGSQL_EXPORT cli_exception: odb::exception { cli_exception (const std::string& what); - ~cli_exception () throw (); + ~cli_exception () ODB_NOTHROW_NOEXCEPT; virtual const char* - what () const throw (); + what () const ODB_NOTHROW_NOEXCEPT; virtual cli_exception* clone () const; -- cgit v1.1