mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macos and pch still not happy with clang-17

Browse Source 
Change-Id: I0f2d8028916d360bcf1dfdf6327a4de6ad053ed4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183599
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2025-04-01 21:14:14 +02:00
parent 30dda57ffc
commit 4cf48d3c9f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/i18nlangtag/lang.h
View File

@@ -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

2
include/o3tl/strong_int.hxx
View File

@@ -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) {}