[Libreoffice-commits] core.git: package/source pyuno/source

Caolán McNamara caolanm at redhat.com
Fri Jan 2 09:06:56 PST 2015


 package/source/zipapi/ZipOutputEntry.cxx |    2 ++
 pyuno/source/module/pyuno_module.cxx     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5484475fc10e965248d6dbb7156a5cd180db88d2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 2 17:02:27 2015 +0000

    include algorithm
    
    Change-Id: I55abf17a1da2616ca2b1303747ca8cc7e402634e

diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx
index 8243bdc..ae7b645 100644
--- a/package/source/zipapi/ZipOutputEntry.cxx
+++ b/package/source/zipapi/ZipOutputEntry.cxx
@@ -32,6 +32,8 @@
 #include <ZipPackageBuffer.hxx>
 #include <ZipPackageStream.hxx>
 
+#include <algorithm>
+
 using namespace com::sun::star;
 using namespace com::sun::star::io;
 using namespace com::sun::star::uno;
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index a214062..4968e66 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -84,7 +84,7 @@ class fillStructState
     // Keyword arguments used
     PyObject *used;
     // Which structure members are initialised
-    std::unordered_map <const OUString, bool, OUStringHash> initialised;
+    std::unordered_map <OUString, bool, OUStringHash> initialised;
     // How many positional arguments are consumed
     // This is always the so-many first ones
     sal_Int32 nPosConsumed;


More information about the Libreoffice-commits mailing list