[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/unx

[Katarina Behrens]

 vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit ee2ce580a186c436662b3864cc5de1d022812a00
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Jun 8 15:04:13 2018 +0200

    Add overloaded read/send funcs for uint64_t (conditionally)
    
    otherwise build fails on 32bit platforms as multiple matching
    overloaded func are found. Thanks _rene_ and mst_ for helping
    me to figure this out
    
    Change-Id: Ief4571ad735ad4efea9ddc70daea45885e5954c7
    Reviewed-on: https://gerrit.libreoffice.org/55474
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit ca4dede186183ca760013ad1885947d68bae02f4)
    Reviewed-on: https://gerrit.libreoffice.org/55628

diff --git a/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx b/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
index 8ce8cfa9e78d..1acef8caf48e 100644
--- a/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
+++ b/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
@@ -100,6 +100,14 @@ inline void readIpcArg(std::istream& stream, sal_uIntPtr& value)
     stream.ignore(); // skip space
 }
 
+#if SAL_TYPES_SIZEOFPOINTER == 4
+inline void readIpcArg(std::istream& stream, uint64_t& value)
+{
+    stream >> value;
+    stream.ignore(); // skip space
+}
+#endif
+
 inline void readIpcArgs(std::istream& /*stream*/)
 {
     // end of arguments, nothing to do
@@ -135,6 +143,10 @@ inline void sendIpcArg(std::ostream& stream, sal_Int16 value) { stream << value
 
 inline void sendIpcArg(std::ostream& stream, sal_uIntPtr value) { stream << value << ' '; }
 
+#if SAL_TYPES_SIZEOFPOINTER == 4
+inline void sendIpcArg(std::ostream& stream, uint64_t value) { stream << value << ' '; }
+#endif
+
 inline void sendIpcArgsImpl(std::ostream& stream)
 {
     // end of arguments, flush stream