[Libreoffice-commits] core.git: sal/osl
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 23 19:06:53 UTC 2019
sal/osl/w32/file.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit bbb5479579dfdfb3e5f2c1c2ccda61cde58d2f39
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 23 17:49:09 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Oct 23 21:05:05 2019 +0200
-Werror,-Wdeprecated-volatile (clang-cl)
same as b89187aad86e2be000d2f4c9c380a95bf8430c2e "Simplify forced memory reads"
in sal/osl/unx/file.cxx
Change-Id: I31edbc72f88895e148609498d367a50e38723b11
Reviewed-on: https://gerrit.libreoffice.org/81408
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 1c219f8f00af..c39c2f16c860 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -777,19 +777,18 @@ oslFileError SAL_CALL osl_mapFile(
* Pagein, touching first byte of each memory page.
* Note: volatile disables optimizing the loop away.
*/
- BYTE * pData(static_cast<BYTE*>(*ppAddr));
+ BYTE volatile * pData(static_cast<BYTE*>(*ppAddr));
SIZE_T nSize(nLength);
- volatile BYTE c = 0;
while (nSize > dwPageSize)
{
- c ^= pData[0];
+ pData[0];
pData += dwPageSize;
nSize -= dwPageSize;
}
if (nSize > 0)
{
- c ^= pData[0];
+ pData[0];
}
}
return osl_File_E_None;
More information about the Libreoffice-commits
mailing list