aboutsummaryrefslogtreecommitdiff
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
commitd1fb1f85fcf47219c6297cf734a9e8682068a577 (patch)
treedd012afe7023a56dd8df36949f47aa35bd718a88
parent2a7fddcc8b90a3e89db7561a52ac12d896dd2b5f (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.
-rw-r--r--odb/oracle/database.hxx1
-rw-r--r--odb/oracle/exceptions.cxx12
-rw-r--r--odb/oracle/exceptions.hxx13
3 files changed, 13 insertions, 13 deletions
diff --git a/odb/oracle/database.hxx b/odb/oracle/database.hxx
index d4a0410..865ac23 100644
--- a/odb/oracle/database.hxx
+++ b/odb/oracle/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/oracle/exceptions.cxx b/odb/oracle/exceptions.cxx
index bfbe78d..1d9bdf1 100644
--- a/odb/oracle/exceptions.cxx
+++ b/odb/oracle/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 ();
}
@@ -68,7 +68,7 @@ namespace odb
//
const char* lob_comparison::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "comparison of LOB values in queries not supported";
}
@@ -90,12 +90,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 ();
}
@@ -111,7 +111,7 @@ namespace odb
//
const char* invalid_oci_handle::
- what () const throw ()
+ what () const ODB_NOTHROW_NOEXCEPT
{
return "invalid oci handle passed or unable to allocate handle";
}
diff --git a/odb/oracle/exceptions.hxx b/odb/oracle/exceptions.hxx
index 58f4efb..8258bae 100644
--- a/odb/oracle/exceptions.hxx
+++ b/odb/oracle/exceptions.hxx
@@ -11,6 +11,7 @@
#include <vector>
#include <odb/exceptions.hxx>
+#include <odb/details/config.hxx> // ODB_NOTHROW_NOEXCEPT
#include <odb/oracle/version.hxx>
#include <odb/oracle/forward.hxx>
@@ -68,13 +69,13 @@ namespace odb
}
public:
- ~database_exception () throw ();
+ ~database_exception () ODB_NOTHROW_NOEXCEPT;
database_exception ();
database_exception (sb4 error, const std::string& message);
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual database_exception*
clone () const;
@@ -90,7 +91,7 @@ namespace odb
struct LIBODB_ORACLE_EXPORT lob_comparison: odb::exception
{
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual lob_comparison*
clone () const;
@@ -99,10 +100,10 @@ namespace odb
struct LIBODB_ORACLE_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;
@@ -114,7 +115,7 @@ namespace odb
struct LIBODB_ORACLE_EXPORT invalid_oci_handle: odb::exception
{
virtual const char*
- what () const throw ();
+ what () const ODB_NOTHROW_NOEXCEPT;
virtual invalid_oci_handle*
clone () const;