[Libreoffice-commits] core.git: vcl/inc vcl/osx
Tor Lillqvist
tml at collabora.com
Thu Sep 21 07:24:54 UTC 2017
vcl/inc/osx/runinmain.hxx | 3 +++
vcl/osx/salinst.cxx | 1 +
2 files changed, 4 insertions(+)
New commits:
commit f28db2168700bd611a33deb3c9aeabb9a35e215c
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Sep 21 10:18:52 2017 +0300
WaE: -Wunused-variable
Change-Id: I6bcc39cd749f8cdbe550b94346c5cb8fd9f67097
diff --git a/vcl/inc/osx/runinmain.hxx b/vcl/inc/osx/runinmain.hxx
index e9ef9113d041..c971d3a25639 100644
--- a/vcl/inc/osx/runinmain.hxx
+++ b/vcl/inc/osx/runinmain.hxx
@@ -77,6 +77,7 @@ union RuninmainResult
}); \
aMutex->m_aInMainCondition.set(); \
osl::Condition::Result res = aMutex->m_aResultCondition.wait(); \
+ (void) res; \
assert(osl::Condition::Result::result_ok == res); \
return; \
}
@@ -96,6 +97,7 @@ union RuninmainResult
}); \
aMutex->m_aInMainCondition.set(); \
osl::Condition::Result res = aMutex->m_aResultCondition.wait(); \
+ (void) res; \
assert(osl::Condition::Result::result_ok == res); \
return static_cast<type>( aMutex->m_aResult.pointer ); \
}
@@ -115,6 +117,7 @@ union RuninmainResult
}); \
aMutex->m_aInMainCondition.set(); \
osl::Condition::Result res = aMutex->m_aResultCondition.wait(); \
+ (void) res; \
assert(osl::Condition::Result::result_ok == res); \
return std::move( aMutex->m_aResult.member ); \
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index d33c0a33af25..54f6ffdd7021 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -292,6 +292,7 @@ void SalYieldMutex::doAcquire( sal_uInt32 nLockCount )
break;
// wait for doRelease() or RUNINMAIN_* to set the condition
osl::Condition::Result res = m_aInMainCondition.wait();
+ (void) res;
assert(osl::Condition::Result::result_ok == res);
}
while ( true );
More information about the Libreoffice-commits
mailing list