diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-08-04 09:01:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-08-04 12:01:42 +0200 |
| commit | 4f37c51e9de14a04365c35f7ec7a4ac256995a51 (patch) | |
| tree | cc114feb82da7b654f98dd11194068b88290f6b2 | |
| parent | c712520cf327de27553f62d0defcce4ba901e4c7 (diff) | |
Fix typos, __clang_ -> __clang__
Change-Id: I89b8a2cb778f91610b6a8e8efc0c4e6ed96a7644
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137778
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | sw/source/core/txtnode/modeltoviewhelper.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index aed37ce19174..78a582866fa0 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -179,14 +179,14 @@ ModelToViewHelper::ModelToViewHelper(const SwTextNode &rNode, [](auto const& it) { return it.second; })) { // prevent -Werror=maybe-uninitialized under gcc 11.2.0 -#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 11 && __GNUC__ <= 12 +#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 11 && __GNUC__ <= 12 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif // i is still hidden but the Range end is oddly "-1" aHiddenMulti.Select({*oStartHidden, i}, true); oStartHidden.reset(); -#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 11 && __GNUC__ <= 12 +#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 11 && __GNUC__ <= 12 #pragma GCC diagnostic pop #endif } diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index f259277304d0..24ff67b4b893 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined __GNUC__ && !defined __clang_ && __GNUC__ == 10 +#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 10 // gcc 10.2.0 gets unhappy about one of the OString inside PrintFont at line 656 (while at least a // recent GCC 12 trunk is happy); // I have to turn it off here because the warning actually occurs inside rtl::OString |