diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-06-15 18:50:51 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-06-15 18:50:51 +0200 |
| commit | 13dd928ae18ef9610bc820b7b3e65629addea1d2 (patch) | |
| tree | d9ee8ef03e3ee5a3be9925de08537b03cf29320b /odb/details/config.hxx | |
| parent | b33321c4d05c0ac759bf3fcf647a568af8bfca0c (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/details/config.hxx')
| -rw-r--r-- | odb/details/config.hxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/odb/details/config.hxx b/odb/details/config.hxx index c36b163..5aa35aa 100644 --- a/odb/details/config.hxx +++ b/odb/details/config.hxx @@ -16,6 +16,7 @@ # define ODB_CXX11 # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 # define ODB_CXX11_NULLPTR +# define ODB_CXX11_NOEXCEPT # endif # define ODB_CXX11_DELETED_FUNCTION # define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR @@ -29,12 +30,15 @@ # define ODB_CXX11 # ifdef __clang__ // Pretends to be a really old __GNUC__ on some platforms. # define ODB_CXX11_NULLPTR +# define ODB_CXX11_NOEXCEPT # elif defined(__GNUC__) # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 # define ODB_CXX11_NULLPTR +# define ODB_CXX11_NOEXCEPT # endif # else # define ODB_CXX11_NULLPTR +# define ODB_CXX11_NOEXCEPT # endif # define ODB_CXX11_DELETED_FUNCTION # define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR @@ -48,6 +52,12 @@ # endif #endif +#ifdef ODB_CXX11_NOEXCEPT +# define ODB_NOTHROW_NOEXCEPT noexcept +#else +# define ODB_NOTHROW_NOEXCEPT throw() +#endif + // no post #endif // ODB_DETAILS_CONFIG_HXX |