aboutsummaryrefslogtreecommitdiff
path: root/odb/exceptions.cxx
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
commit13dd928ae18ef9610bc820b7b3e65629addea1d2 (patch)
treed9ee8ef03e3ee5a3be9925de08537b03cf29320b /odb/exceptions.cxx
parentb33321c4d05c0ac759bf3fcf647a568af8bfca0c (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/exceptions.cxx')
-rw-r--r--odb/exceptions.cxx56
1 files changed, 28 insertions, 28 deletions
diff --git a/odb/exceptions.cxx b/odb/exceptions.cxx
index ebbc543..3ce1449 100644
--- a/odb/exceptions.cxx
+++ b/odb/exceptions.cxx
@@ -13,7 +13,7 @@ using namespace std;
namespace odb
{
const char* null_pointer::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "NULL pointer";
}
@@ -25,7 +25,7 @@ namespace odb
}
const char* already_in_transaction::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "transaction already in progress in this thread";
}
@@ -37,7 +37,7 @@ namespace odb
}
const char* not_in_transaction::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "operation can only be performed in transaction";
}
@@ -49,7 +49,7 @@ namespace odb
}
const char* transaction_already_finalized::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "transaction already committed or rolled back";
}
@@ -61,7 +61,7 @@ namespace odb
}
const char* already_in_session::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "session already in effect in this thread";
}
@@ -73,7 +73,7 @@ namespace odb
}
const char* not_in_session::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "session not in effect in this thread";
}
@@ -85,7 +85,7 @@ namespace odb
}
const char* session_required::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "session required to load this object relationship";
}
@@ -97,7 +97,7 @@ namespace odb
}
const char* deadlock::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "transaction aborted due to deadlock";
}
@@ -109,7 +109,7 @@ namespace odb
}
const char* connection_lost::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "connection to database lost";
}
@@ -121,7 +121,7 @@ namespace odb
}
const char* timeout::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "database operation timeout";
}
@@ -133,7 +133,7 @@ namespace odb
}
const char* object_not_persistent::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "object not persistent";
}
@@ -145,7 +145,7 @@ namespace odb
}
const char* object_already_persistent::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "object already persistent";
}
@@ -157,7 +157,7 @@ namespace odb
}
const char* object_changed::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "object changed concurrently";
}
@@ -169,7 +169,7 @@ namespace odb
}
const char* result_not_cached::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "query result is not cached";
}
@@ -181,7 +181,7 @@ namespace odb
}
const char* abstract_class::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "database operation on instance of abstract class";
}
@@ -193,7 +193,7 @@ namespace odb
}
const char* no_type_info::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "no type information";
}
@@ -214,12 +214,12 @@ namespace odb
}
prepared_already_cached::
- ~prepared_already_cached () throw ()
+ ~prepared_already_cached () ODB_NOTHROW_NOEXCEPT
{
}
const char* prepared_already_cached::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return what_.c_str ();
}
@@ -240,12 +240,12 @@ namespace odb
}
prepared_type_mismatch::
- ~prepared_type_mismatch () throw ()
+ ~prepared_type_mismatch () ODB_NOTHROW_NOEXCEPT
{
}
const char* prepared_type_mismatch::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return what_.c_str ();
}
@@ -266,12 +266,12 @@ namespace odb
}
unknown_schema::
- ~unknown_schema () throw ()
+ ~unknown_schema () ODB_NOTHROW_NOEXCEPT
{
}
const char* unknown_schema::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return what_.c_str ();
}
@@ -293,12 +293,12 @@ namespace odb
}
unknown_schema_version::
- ~unknown_schema_version () throw ()
+ ~unknown_schema_version () ODB_NOTHROW_NOEXCEPT
{
}
const char* unknown_schema_version::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return what_.c_str ();
}
@@ -310,7 +310,7 @@ namespace odb
}
const char* section_not_loaded::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "section is not loaded";
}
@@ -322,7 +322,7 @@ namespace odb
}
const char* section_not_in_object::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "section instance is not part of an object (section was copied?)";
}
@@ -336,7 +336,7 @@ namespace odb
// multiple_exceptions
//
multiple_exceptions::
- ~multiple_exceptions () throw () {}
+ ~multiple_exceptions () ODB_NOTHROW_NOEXCEPT {}
void multiple_exceptions::
insert (size_t p, bool maybe, const odb::exception& e, bool fatal)
@@ -418,7 +418,7 @@ namespace odb
}
const char* multiple_exceptions::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return what_.c_str ();
}