[Libreoffice-commits] core.git: sal/osl

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Sep 16 11:11:33 UTC 2019


 sal/osl/unx/file.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bdcf58bdb178402bad25ea1459af3611648eb196
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 16 10:24:11 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 16 13:10:54 2019 +0200

    -Werror=volatile (GCC 10 trunk)
    
    "error: compound assignment with ‘volatile’-qualified left operand is
    deprecated" in C++20 mode
    
    Change-Id: I62825237a2f4caf359f5f116ab4097ae6b9376e6
    Reviewed-on: https://gerrit.libreoffice.org/78975
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index e961c36c7662..39d9d16334c7 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1181,13 +1181,13 @@ oslFileError SAL_CALL osl_mapFile(
             volatile sal_uInt8 c = 0;
             while (nSize > nPageSize)
             {
-                c ^= pData[0];
+                c = c ^ pData[0];
                 pData += nPageSize;
                 nSize -= nPageSize;
             }
 
             if (nSize > 0)
-                c^= pData[0];
+                c = c ^ pData[0];
         }
     }
 


More information about the Libreoffice-commits mailing list