vcl/win/app/salinst.cxx | 1 +
vcl/win/app/saltimer.cxx | 2 ++
2 files changed, 3 insertions(+)
New commits:
commit e772298b7736a7c82d7c31bc78cf453645762658
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Dec 14 10:33:13 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Tue Jun 7 08:36:18 2022 +0200
Silence MSVC warning C4189 "local variable is initialized but not
referenced"
Change-Id: I346cf6cf148cd3b4ac851f8c441d54c858f55935
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107674
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 4376820074abc4d70765675ef5a4adae8f58effe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135315
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 1994a274f8b4..727c3f5c7cf9 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -148,6 +148,7 @@ void SalYieldMutex::doAcquire( sal_uInt32 nLockCount )
// wait for SalYieldMutex::release() to set the condition
osl::Condition::Result res = m_condition.wait();
assert(osl::Condition::Result::result_ok == res);
+ (void) res;
}
while ( true );
}
commit 52a108e396084246da3250ca20bf14c6a9916eef
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Dec 14 22:32:28 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Tue Jun 7 08:36:04 2022 +0200
Silence warning C4189: local variable is initialized but not referenced
Change-Id: Ie36d7c4dfee5115b5909ed58a0b16b367e05866d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107734
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 14372e301f0198067e4965ac1a234d9f9d21e3b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135314
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index d3101d3df527..1c526658e440 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -62,8 +62,10 @@ void WinSalTimer::ImplStop()
void WinSalTimer::ImplStart( sal_uInt64 nMS )
{
+#if !defined NDEBUG
SalData* pSalData = GetSalData();
assert( !pSalData->mpInstance || pSalData->mnAppThreadId ==
GetCurrentThreadId() );
+#endif
// DueTime parameter is a DWORD, which is always an unsigned 32bit
if (nMS > SAL_MAX_UINT32)
