[git commit master 1/1] string: Fix copy'n paste error

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Sun Nov 21 00:23:16 UTC 2010


commit: http://git.uclibc.org/uClibc++/commit/?id=ed6c2c582bfae29c1ba397bca82368975f26658c
branch: http://git.uclibc.org/uClibc++/commit/?id=refs/heads/master

../include/string:1020: error: conflicting declaration ‘const char* rhs’
../include/string:1020: error: ‘rhs’ has a previous declaration as
‘const std::string& rhs’
../include/string:1020: error: ‘bool std::operator==(const
std::string&)’ must take exactly two arguments
../include/string:1024: error: conflicting declaration ‘const char* rhs’
../include/string:1024: error: ‘rhs’ has a previous declaration as
‘const std::string& rhs’
../include/string:1024: error: ‘bool std::operator!=(const
std::string&)’ must take exactly two arguments

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 include/string |    4 ++--
 src/string.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/string b/include/string
index 0ef66e5..ad86de7 100644
--- a/include/string
+++ b/include/string
@@ -1017,11 +1017,11 @@ template<class charT, class traits, class Allocator> _UCXXEXPORT void
 
 template <> _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
 template <> _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
-template <> _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
+template <> _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
 
 template <> _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
 template <> _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
-template <> _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
+template <> _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
 
 template <> _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
 template <> _UCXXEXPORT string operator+(const char* lhs, const string & rhs);
diff --git a/src/string.cpp b/src/string.cpp
index 351665e..1edf69b 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -76,11 +76,11 @@ namespace std{
 
 	template _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
 	template _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
-	template _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
+	template _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
 
 	template _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
 	template _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
-	template _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
+	template _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
 
 	template _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
 	template _UCXXEXPORT string operator+(const char* lhs, const string & rhs);
-- 
1.7.2.2



More information about the uClibc-cvs mailing list