[Libreoffice-commits] .: liborcus/liborcus_0.1.0-warnings.patch liborcus/UnpackedTarball_orcus.mk

[Libreoffice Gerrit user]

 liborcus/UnpackedTarball_orcus.mk      |    2 +-
 liborcus/liborcus_0.1.0-warnings.patch |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit bed5557e8bdfe5c698a45a4cc82619a7c22de001
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Sep 20 09:05:57 2012 +0300

    WaE: declaration of 'size' shadows a member of 'this'
    
    Change-Id: Ie620d906184efcba0eb92cd8757a90a97d61ff87

diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index 030eebd..f6a054b 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
 
 orcus_patches :=
-# -Werror,-Wunused-variable -Werror,-Wunused-private-field
+# -Werror=unused-variable -Werror=unused-private-field -Werror=shadow
 orcus_patches += liborcus_0.1.0-warnings.patch
 # make config.sub recognize arm-linux-androideabi
 orcus_patches += liborcus_0.1.0-configure.patch
diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch
index 8ce6533..8eb98bb 100644
--- a/liborcus/liborcus_0.1.0-warnings.patch
+++ b/liborcus/liborcus_0.1.0-warnings.patch
@@ -60,3 +60,17 @@
      }
      else
      {
+--- include/orcus/pstring.hpp
++++ include/orcus/pstring.hpp
+@@ -82,8 +82,8 @@
+     };
+ 
+     pstring() : m_pos(NULL), m_size(0) {}
+-    pstring(const char* pos) : m_pos(pos) { m_size = ::std::strlen(pos); }
+-    pstring(const char* pos, size_t size) : m_pos(pos), m_size(size) {}
++    pstring(const char* pos_) : m_pos(pos_) { m_size = ::std::strlen(pos_); }
++    pstring(const char* pos_, size_t size_) : m_pos(pos_), m_size(size_) {}
+ 
+     ::std::string str() const { return ::std::string(m_pos, m_size); }
+ 
+