aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odb/mssql/database.hxx1
-rw-r--r--odb/mssql/exceptions.cxx10
-rw-r--r--odb/mssql/exceptions.hxx11
3 files changed, 11 insertions, 11 deletions
diff --git a/odb/mssql/database.hxx b/odb/mssql/database.hxx
index de179bd..6e5a86b 100644
--- a/odb/mssql/database.hxx
+++ b/odb/mssql/database.hxx
@@ -8,7 +8,6 @@
#include <odb/pre.hxx>
#include <string>
-#include <memory> // std::auto_ptr, std::unique_ptr
#include <iosfwd> // std::ostream
#include <odb/database.hxx>
diff --git a/odb/mssql/exceptions.cxx b/odb/mssql/exceptions.cxx
index 373fb82..166d958 100644
--- a/odb/mssql/exceptions.cxx
+++ b/odb/mssql/exceptions.cxx
@@ -23,7 +23,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 ();
}
@@ -95,7 +95,7 @@ namespace odb
//
const char* long_data_reload::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "attempt to re-load object or view with long data "
"from query result";
diff --git a/odb/mssql/exceptions.hxx b/odb/mssql/exceptions.hxx
index b53e08e..6b26037 100644
--- a/odb/mssql/exceptions.hxx
+++ b/odb/mssql/exceptions.hxx
@@ -11,6 +11,7 @@
#include <vector>
#include <odb/exceptions.hxx>
+#include <odb/details/config.hxx> // ODB_NOTHROW_NOEXCEPT
#include <odb/mssql/version.hxx>
#include <odb/mssql/forward.hxx>
@@ -77,13 +78,13 @@ namespace odb
}
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual database_exception*
clone () const;
public:
- ~database_exception () throw ();
+ ~database_exception () ODB_NOTHROW_NOEXCEPT;
database_exception ();
database_exception (SQLINTEGER error,
@@ -103,10 +104,10 @@ namespace odb
struct LIBODB_MSSQL_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;
@@ -118,7 +119,7 @@ namespace odb
struct LIBODB_MSSQL_EXPORT long_data_reload: odb::exception
{
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual long_data_reload*
clone () const;