diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 09:29:21 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-20 09:29:21 +0300 |
| commit | 21b5706f83edecad8cd3d0ab3ce5110b82e75a46 (patch) | |
| tree | 7ffa6bbedca54bc8f4655ad7a79e933dc4bae240 /liborcus | |
| parent | bed5557e8bdfe5c698a45a4cc82619a7c22de001 (diff) | |
WaE: declaration of 'str' shadows a member of 'this'
Change-Id: Ibbbe331421434e15c4659b5c566dadecf441dff8
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/liborcus_0.1.0-warnings.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch index 8eb98bbbacc3..8ddcdad6e8bd 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; + |