liborcus/liborcus_0.1.0-warnings.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
New commits: commit 21b5706f83edecad8cd3d0ab3ce5110b82e75a46 Author: Tor Lillqvist <[email protected]> Date: Thu Sep 20 09:29:21 2012 +0300 WaE: declaration of 'str' shadows a member of 'this' Change-Id: Ibbbe331421434e15c4659b5c566dadecf441dff8 diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch index 8eb98bb..8ddcdad 100644 --- a/liborcus/liborcus_0.1.0-warnings.patch +++ b/liborcus/liborcus_0.1.0-warnings.patch @@ -73,4 +73,20 @@ ::std::string str() const { return ::std::string(m_pos, m_size); } +@@ -110,11 +110,11 @@ + + bool operator< (const pstring& r) const; + +- bool operator== (const char* str) const; ++ bool operator== (const char* str_) const; + +- bool operator!= (const char* str) const ++ bool operator!= (const char* str_) const + { +- return !operator==(str); ++ return !operator==(str_); + } + + pstring trim() const; + _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
