vcl/source/app/watchdog.cxx | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 9f60ee1b57ada579d1afe2fe322af53f211c4549
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 31 17:43:35 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Aug 31 23:07:31 2020 +0200
Clean up some SAL_WARN argument streaming
Change-Id: I78841ff2d6356d4789664029a3fa82771178e941
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101754
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/source/app/watchdog.cxx b/vcl/source/app/watchdog.cxx
index 588cf6d579be..f43f708b1eb4 100644
--- a/vcl/source/app/watchdog.cxx
+++ b/vcl/source/app/watchdog.cxx
@@ -56,8 +56,7 @@ template <typename Zone> struct WatchdogHelper
if (!bFired)
{
gbWatchdogFiring = true;
- SAL_WARN("vcl.watchdog",
- OStringLiteral("Watchdog triggered: hard disable
") + Zone::name());
+ SAL_WARN("vcl.watchdog", "Watchdog triggered: hard disable
" << Zone::name());
Zone::hardDisable();
gbWatchdogFiring = false;
}
@@ -66,8 +65,7 @@ template <typename Zone> struct WatchdogHelper
// we can hang using VCL in the abort handling -> be impatient
if (bAbortFired)
{
- SAL_WARN("vcl.watchdog",
- OStringLiteral("Watchdog gave up: hard exiting ")
+ Zone::name());
+ SAL_WARN("vcl.watchdog", "Watchdog gave up: hard exiting "
<< Zone::name());
_Exit(1);
}
}
@@ -77,8 +75,7 @@ template <typename Zone> struct WatchdogHelper
{
if (!bAbortFired)
{
- SAL_WARN("vcl.watchdog",
- OStringLiteral("Watchdog gave up: aborting ") +
Zone::name());
+ SAL_WARN("vcl.watchdog", "Watchdog gave up: aborting " <<
Zone::name());
gbWatchdogFiring = true;
std::abort();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
