diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 09:05:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-20 09:05:57 +0300 |
| commit | bed5557e8bdfe5c698a45a4cc82619a7c22de001 (patch) | |
| tree | c5cb9366db1e20cc59b213da58fc806317d57746 /liborcus | |
| parent | 6a8694d91e051412108601806cc5325b0641b5f2 (diff) | |
WaE: declaration of 'size' shadows a member of 'this'
Change-Id: Ie620d906184efcba0eb92cd8757a90a97d61ff87
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/UnpackedTarball_orcus.mk | 2 | ||||
| -rw-r--r-- | liborcus/liborcus_0.1.0-warnings.patch | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk index 030eebdea1ec..f6a054b942ca 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 8ce6533c0908..8eb98bbbacc3 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); } + + |