bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h | 6 ------ vcl/source/app/scheduler.cxx | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-)
New commits: commit 61f3c760e573044bc51b94f00470c4fdd6d5c22f Author: jan Iversen <j...@libreoffice.org> Date: Mon Feb 19 16:14:16 2018 +0100 iOS, remove throw definition clean cpp_uno part. Change-Id: Ief08e4cf596b375243ae215d8dc2e1cdb5830ac1 diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h index 2ffa69e70257..034baff5738e 100644 --- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h +++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h @@ -188,12 +188,6 @@ extern "C" void *__cxa_allocate_dependent_exception() throw(); extern "C" void __cxa_free_dependent_exception(void *thrown_exception) throw(); #pragma GCC visibility pop -// Throw the exception. -extern "C" void __cxa_throw (void *thrown_exception, - std::type_info *tinfo, - void (*dest) (void *)) - __attribute__((noreturn)); - // Used to implement exception handlers. extern "C" void *__cxa_get_exception_ptr (void *) throw(); extern "C" void *__cxa_begin_catch (void *) throw(); commit 18d50b61ce1da7e989127fb518bbf5d140a3ba7a Author: jan Iversen <j...@libreoffice.org> Date: Sun Feb 18 12:39:13 2018 +0100 vcl/scheduler adjusted time check. the sal_timer might be off with a fraction, so when comparing it is -1 (due to use of int), which lead to adding 250 ticks. Changed check to be if time < wanted time - 1 add extra time Change-Id: I788b3e3b491a513f44f7b495727d1a6842af6109 diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 1928161aecea..d7f80e1f1783 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -345,7 +345,8 @@ bool Scheduler::ProcessTaskScheduling() return false; sal_uInt64 nTime = tools::Time::GetSystemTicks(); - if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod ) + // Allow for decimals, so subtract in the compare (needed at least on iOS) + if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod -1) { SAL_WARN( "vcl.schedule", "we're too early - restart the timer!" ); UpdateSystemTimer( rSchedCtx, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits