[haiku-commits] haiku: hrev46691 - headers/cpp/std
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 17 Jan 2014 10:01:01 +0100 (CET)
hrev46691 adds 1 changeset to branch 'master'
old head: d0f2d8282f3f59a1af7fe2d340d2af0cb36a9b20
new head: e1caa56b1e49e83f71ba7998969efbf3bcdbf5dc
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e1caa56+%5Ed0f2d82
----------------------------------------------------------------------------
e1caa56: Add another mssing string::compare prototype.
Matches buildtools change 8b70c20ed25f905e7e217376c9e2f65a8dee6729.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46691
Commit: e1caa56b1e49e83f71ba7998969efbf3bcdbf5dc
URL: http://cgit.haiku-os.org/haiku/commit/?id=e1caa56
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Fri Jan 17 09:00:32 2014 UTC
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 4 deletions(-)
headers/cpp/std/bastring.h | 10 ++++++----
----------------------------------------------------------------------------
diff --git a/headers/cpp/std/bastring.h b/headers/cpp/std/bastring.h
index 15bf4b5..4b7f7d6 100644
--- a/headers/cpp/std/bastring.h
+++ b/headers/cpp/std/bastring.h
@@ -408,13 +408,15 @@ public:
basic_string substr (size_type pos = 0, size_type n = npos) const
{ return basic_string (*this, pos, n); }
- int compare (const basic_string& str, size_type pos = 0, size_type n = npos)
const;
- // There is no 'strncmp' equivalent for charT pointers.
- // BeOS bogus version
+ // BeOS bogus versions
int compare (const charT* s, size_type pos, size_type n) const;
+ int compare (const basic_string& str, size_type pos = 0, size_type n = npos)
const;
+ // There is no 'strncmp' equivalent for charT pointers.
- // Correct std C++ prototype
+ // Correct std C++ prototypes
+ int compare (size_type pos, size_type n, const basic_string& str) const
+ { return compare(str, pos, n); }
int compare (size_type pos, size_type n, const charT* s) const
{ return compare(s, pos, n); }
int compare (const charT* s, size_type pos = 0) const
Other related posts:
- » [haiku-commits] haiku: hrev46691 - headers/cpp/std - pulkomandy
