[Libreoffice-commits] core.git: external/mysqlcppconn mysqlc/source

[Stephan Bergmann]

 external/mysqlcppconn/Library_mysqlcppconn.mk         |    9 ---------
 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |    1 +
 external/mysqlcppconn/patches/dynexcspec.patch.0      |   15 +++++++++++++++
 mysqlc/source/mysqlc_general.hxx                      |    7 -------
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit f89f9aa6adcc5af5adff7ba1c589734c73ed80ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 23 12:20:49 2017 +0100

    With GCC -std=gnu++17, dynamic exception specifications cause an error
    
    ...instead of a warning (as with Clang), so this follow-up to
    e16644fa1c042b56a1301f0476d7ddb71c8765ea "external/mysqlcppconn: Silence
    -Wdynamic-exception-spec errors" patches the (few) dynamic exception
    specifications out of external/mysqlcppconn completely
    
    Change-Id: I83a42f1c09e60c15fad1564cf7c42eb3370485da

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 70599b0..e289482 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 65f0f83..82a3684 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 0000000..ed7ac36
--- /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 d3e12ee..5d0b828 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