sal/osl/all/log.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 0d5804cc8e26cbf315c85c3d1c5d62929f49b470 Author: Giuseppe Castagno <giuseppe.casta...@acca-esse.eu> Date: Thu Aug 18 16:56:07 2016 +0200 Fix sal log for 32 bit Linux build Change-Id: I2644079cafa46db8689463e1d0abc1cf3bdf49de Reviewed-on: https://gerrit.libreoffice.org/28222 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index f9a6a4e..da167a7 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -131,7 +131,7 @@ void maybeOutputTimestamp(std::ostringstream &s) { tm.tm_year = dateTime.Year - 1900; strftime(ts, sizeof(ts), "%Y-%m-%d:%H:%M:%S", &tm); char milliSecs[10]; - sprintf(milliSecs, "%03d", dateTime.NanoSeconds/1000000); + sprintf(milliSecs, "%03d", static_cast<int>(dateTime.NanoSeconds/1000000)); s << ts << '.' << milliSecs << ':'; } if (outputRelativeTimer) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits