include/i18nlangtag/lang.h | 2 +- include/o3tl/strong_int.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 4cf48d3c9f1c44a9fc9cdedefd638a54c92030e5 Author: Noel Grandin <[email protected]> AuthorDate: Tue Apr 1 21:14:14 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Apr 1 22:47:52 2025 +0200 macos and pch still not happy with clang-17 Change-Id: I0f2d8028916d360bcf1dfdf6327a4de6ad053ed4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183599 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 894b843cfb79..65730e495d61 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -94,7 +94,7 @@ namespace o3tl // when compiling LO on macOS, debug builds will display a linking error where, see // <https://lists.freedesktop.org/archives/libreoffice/2024-February/091564.html>, "Our Clang // --enable-pch setup is known broken": -#if !(defined MACOSX && defined __clang__ && __clang_major__ == 16 && ENABLE_PCH) +#if !(defined MACOSX && defined __clang__ && (__clang_major__ == 16 || __clang_major__ == 17) && ENABLE_PCH) // delete "sal_Int16" constructor via specialization: values > 0x7FFF are // actually used, and unfortunately passed around in the API as signed // "short", so use this to find all places where casts must be inserted diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx index f8fc1952dd1c..950366f8e3c3 100644 --- a/include/o3tl/strong_int.hxx +++ b/include/o3tl/strong_int.hxx @@ -88,7 +88,7 @@ public: // when compiling LO on macOS, debug builds will display a linking error where, see // <https://lists.freedesktop.org/archives/libreoffice/2024-February/091564.html>, "Our Clang // --enable-pch setup is known broken": -#if defined MACOSX && defined __clang__ && __clang_major__ == 16 && ENABLE_PCH +#if defined MACOSX && defined __clang__ && (__clang_major__ == 16 || __clang_major__ == 17) && ENABLE_PCH explicit constexpr strong_int(unsigned long long value) : m_value(value) {} explicit constexpr strong_int(unsigned long value) : m_value(value) {} explicit constexpr strong_int(long value) : m_value(value) {}
