sal/osl/all/log.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit e00925c5ffa0a70253ea1c38ee0a5df3739242fc
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Mar 27 08:09:48 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 28 08:03:38 2025 +0100
Suppress -Werror,-Wunused-macros
...during a public.ecr.aws/allotropia/libo-builders/lode based ASan/UBSan
build,
> sal/osl/all/log.cxx:22:9: error: macro is not used
[-Werror,-Wunused-macros]
> #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
> ^
(where the compiler happens to be Clang, so use a `#pragma clang` for
simplicity, even if this has probably more to do with the version of
libstdc++
being used than with the actual compiler). This is in non-master code that
was
added to resolve conflicts in cherry-pick
9fb2fa9bddef863c1e444861f939d4d7956dcc4b "Best effort to create directories
of
SAL_LOG_FILE".
Change-Id: I0c394180567526d65d61afa5aa8afecff67633a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183376
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 3377d615a6ab..a169b8e578fa 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -19,6 +19,9 @@
#include <stdio.h>
#include <string.h>
+#if defined __clang__
+#pragma clang diagnostic ignored "-Wunused-macros"
+#endif
#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
#include <experimental/filesystem>
#include <fstream>
commit 500d86c7d3cb13cf220b03f8b9d698ae9e19c3d2
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Mar 26 13:52:55 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 28 08:03:28 2025 +0100
Rename sanitize-ubsan-blacklist -> sanitize-ubsan-excludelist
...which upstream did as part of 493ae7a6bb0c3ad50615db0090e7ae8d391bc327
"replace usage of blacklist with denylist". This helps sharing ASan/UBSan
build
infrastructure across multiple branches.
Change-Id: Ib2cd7c95791458724422a33a6e10de608939353a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183375
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: allotropia jenkins <jenk...@allotropia.de>
diff --git a/sanitize-ubsan-blacklist b/sanitize-ubsan-excludelist
similarity index 100%
rename from sanitize-ubsan-blacklist
rename to sanitize-ubsan-excludelist
