diff options
| -rw-r--r-- | external/mysqlcppconn/Library_mysqlcppconn.mk | 9 | ||||
| -rw-r--r-- | external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/dynexcspec.patch.0 | 15 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_general.hxx | 7 |
4 files changed, 16 insertions, 16 deletions
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk index 70599b05e328..e2894824bc18 100644 --- a/external/mysqlcppconn/Library_mysqlcppconn.mk +++ b/external/mysqlcppconn/Library_mysqlcppconn.mk @@ -58,15 +58,6 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\ )) endif -# Avoid -Wdynamic-exception-spec errors in Clang C++17 mode: -ifeq ($(COM_IS_CLANG),TRUE) -$(eval $(call gb_Library_add_cxxflags,mysqlcppconn, \ - $(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \ - $(CXXFLAGS_CXX11)), \ - -Wno-error=dynamic-exception-spec) \ -)) -endif - $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \ UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \ diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 65f0f8300d1e..82a368460747 100644 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ external/mysqlcppconn/patches/warnings.patch.0 \ external/mysqlcppconn/patches/enable-libmysql-proxy.patch \ + external/mysqlcppconn/patches/dynexcspec.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/patches/dynexcspec.patch.0 b/external/mysqlcppconn/patches/dynexcspec.patch.0 new file mode 100644 index 000000000000..ed7ac3685a4b --- /dev/null +++ b/external/mysqlcppconn/patches/dynexcspec.patch.0 @@ -0,0 +1,15 @@ +--- cppconn/exception.h ++++ cppconn/exception.h +@@ -36,10 +36,10 @@ + { + + #define MEMORY_ALLOC_OPERATORS(Class) \ +- void* operator new(size_t size) throw (std::bad_alloc) { return ::operator new(size); } \ ++ void* operator new(size_t size) { return ::operator new(size); } \ + void* operator new(size_t, void*) throw(); \ + void* operator new(size_t, const std::nothrow_t&) throw(); \ +- void* operator new[](size_t) throw (std::bad_alloc); \ ++ void* operator new[](size_t); \ + void* operator new[](size_t, void*) throw(); \ + void* operator new[](size_t, const std::nothrow_t&) throw(); \ + void* operator new(size_t N, std::allocator<Class>&); diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index d3e12ee11c2c..5d0b828c3e51 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -29,14 +29,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" #endif -#if defined __clang__ && __cplusplus > 201402L -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdynamic-exception-spec" -#endif #include <cppconn/exception.h> -#if defined __clang__ && __cplusplus > 201402L -#pragma clang diagnostic pop -#endif #if defined __GNUC__ #pragma GCC diagnostic pop #endif |