You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.7 KiB
53 lines
1.7 KiB
From e7379dfe3d3d92fe265d762a3f0399205e5b2816 Mon Sep 17 00:00:00 2001
|
|
From: rpmbuild <rpmbuild@fedoraproject.org>
|
|
Date: Fri, 24 Jul 2020 20:37:13 +0100
|
|
Subject: [PATCH] workaround internal compiler error
|
|
|
|
---
|
|
forms/source/component/ListBox.cxx | 2 +-
|
|
vcl/workben/vcldemo.cxx | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
|
|
index 7c51f7c..0e75606 100644
|
|
--- a/forms/source/component/ListBox.cxx
|
|
+++ b/forms/source/component/ListBox.cxx
|
|
@@ -1994,7 +1994,7 @@ namespace frm
|
|
}
|
|
}
|
|
if (t.is()) {
|
|
- t->join();
|
|
+ t->comphelper::AsyncEventNotifier::join();
|
|
}
|
|
|
|
OBoundControl::disposing();
|
|
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
|
|
index 74dc6fb..9655a77 100644
|
|
--- a/vcl/workben/vcldemo.cxx
|
|
+++ b/vcl/workben/vcldemo.cxx
|
|
@@ -1730,7 +1730,7 @@ class DemoWin : public WorkWindow
|
|
}
|
|
virtual ~RenderThread() override
|
|
{
|
|
- join();
|
|
+ salhelper::Thread::join();
|
|
}
|
|
virtual void execute() override
|
|
{
|
|
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
|
|
index c73bd22..2095359 100644
|
|
--- a/comphelper/source/misc/asyncnotification.cxx
|
|
+++ b/comphelper/source/misc/asyncnotification.cxx
|
|
@@ -195,7 +195,7 @@ namespace comphelper
|
|
if (pNotifier)
|
|
{
|
|
pNotifier->terminate();
|
|
- pNotifier->join();
|
|
+ pNotifier->AsyncEventNotifierAutoJoin::join();
|
|
}
|
|
}
|
|
// note it's possible that g_Notifiers isn't empty now in case of leaks,
|
|
--
|
|
2.26.2
|
|
|