aboutsummaryrefslogtreecommitdiff
path: root/odb/sqlite
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
commit293c30123235e3c0ed724143234d6494afd2f6c8 (patch)
treeb8cc7e7c852d9bc1895b50860d87d18a711bf132 /odb/sqlite
parent8f7e466213c46a419694c9960fb0c53687329210 (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 'odb/sqlite')
-rw-r--r--odb/sqlite/database.hxx1
-rw-r--r--odb/sqlite/exceptions.cxx10
-rw-r--r--odb/sqlite/exceptions.hxx11
3 files changed, 11 insertions, 11 deletions
diff --git a/odb/sqlite/database.hxx b/odb/sqlite/database.hxx
index f846f9e..cb837b4 100644
--- a/odb/sqlite/database.hxx
+++ b/odb/sqlite/database.hxx
@@ -10,7 +10,6 @@
#include <sqlite3.h>
#include <string>
-#include <memory> // std::auto_ptr, std::unique_ptr
#include <iosfwd> // std::ostream
#include <odb/database.hxx>
diff --git a/odb/sqlite/exceptions.cxx b/odb/sqlite/exceptions.cxx
index 77436ae..ab54340 100644
--- a/odb/sqlite/exceptions.cxx
+++ b/odb/sqlite/exceptions.cxx
@@ -17,7 +17,7 @@ namespace odb
//
const char* forced_rollback::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "transaction is forced to rollback";
}
@@ -33,7 +33,7 @@ namespace odb
//
database_exception::
- ~database_exception () throw ()
+ ~database_exception () ODB_NOTHROW_NOEXCEPT
{
}
@@ -52,7 +52,7 @@ namespace odb
}
const char* database_exception::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return what_.c_str ();
}
@@ -74,12 +74,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/sqlite/exceptions.hxx b/odb/sqlite/exceptions.hxx
index 067abcc..01bf5ec 100644
--- a/odb/sqlite/exceptions.hxx
+++ b/odb/sqlite/exceptions.hxx
@@ -10,6 +10,7 @@
#include <string>
#include <odb/exceptions.hxx>
+#include <odb/details/config.hxx> // ODB_NOTHROW_NOEXCEPT
#include <odb/sqlite/version.hxx>
#include <odb/sqlite/forward.hxx>
@@ -28,7 +29,7 @@ namespace odb
struct LIBODB_SQLITE_EXPORT forced_rollback: recoverable
{
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual forced_rollback*
clone () const;
@@ -40,7 +41,7 @@ namespace odb
int extended_error,
const std::string& message);
- ~database_exception () throw ();
+ ~database_exception () ODB_NOTHROW_NOEXCEPT;
int
error () const
@@ -61,7 +62,7 @@ namespace odb
}
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual database_exception*
clone () const;
@@ -76,10 +77,10 @@ namespace odb
struct LIBODB_SQLITE_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;