diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-17 15:06:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-17 18:34:39 +0200 |
| commit | 4417c30d6aa8d415f1f63364bb5dedcd44ae5562 (patch) | |
| tree | 410d86ebb631971b4c8e7819120462eaf7d6dc31 /external | |
| parent | 64d2c70c9092149e634ff8bcf416ef2fb10d3062 (diff) | |
external/coinmp: Avoid -Werror,-Wc++2b-extensions
> ClpSimplex.cpp:6038:2: error: use of a '#elifdef' directive is a C++2b extension [-Werror,-Wc++2b-extensions]
> #elifdef COIN_HAS_MUMPS
> ^
seen with Clang 15 trunk since
<https://github.com/llvm/llvm-project/commit/a1545f51a9ef299ca6c6716bd80b862f360453ab>
"Warn if using `elifdef` & `elifndef` in not C2x & C++2b mode" (and which is
turned into an error because External_coinmp builds with --pedantic-errors)
Change-Id: I1db213aec91bc17c720fd58270eab452b2e4e0f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134478
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/coinmp/UnpackedTarball_coinmp.mk | 1 | ||||
| -rw-r--r-- | external/coinmp/pedantic-errors.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 0784bbde1ac1..0764d428aace 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ external/coinmp/Wnon-c-typedef-for-linkage.patch \ external/coinmp/register.patch \ external/coinmp/configure-exit.patch \ + external/coinmp/pedantic-errors.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/coinmp/pedantic-errors.patch b/external/coinmp/pedantic-errors.patch new file mode 100644 index 000000000000..2cf86b7e0ef4 --- /dev/null +++ b/external/coinmp/pedantic-errors.patch @@ -0,0 +1,11 @@ +--- Clp/src/ClpSimplex.cpp ++++ Clp/src/ClpSimplex.cpp +@@ -6035,7 +6035,7 @@ + assert (!doKKT); + ClpCholeskyTaucs * cholesky = new ClpCholeskyTaucs(); + barrier.setCholesky(cholesky); +-#elifdef COIN_HAS_MUMPS ++#elif defined COIN_HAS_MUMPS + if (!doKKT) { + ClpCholeskyMumps * cholesky = new ClpCholeskyMumps(); + barrier.setCholesky(cholesky); |