summaryrefslogtreecommitdiff
path: root/mysqlc/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-23 12:20:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-23 12:20:49 +0100
commitf89f9aa6adcc5af5adff7ba1c589734c73ed80ab (patch)
treeee55cc77a61232d75775f05719a0c92f9fbdeaec /mysqlc/source
parent9d2721b1bb1256446a89ae8ab8f31f7f780d500c (diff)
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
Diffstat (limited to 'mysqlc/source')
-rw-r--r--mysqlc/source/mysqlc_general.hxx7
1 files changed, 0 insertions, 7 deletions
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