From 837b16251d4b2b6249ebcaa19bb319cbe82c6126 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 31 Oct 2011 09:56:00 +0000 Subject: [PATCH] Fix #7948: add correct prototype for String::compare alongside the wrong one for BeOS compatibility. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43023 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/cpp/std/bastring.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/headers/cpp/std/bastring.h b/headers/cpp/std/bastring.h index 1fdff54d0e..b07761e961 100644 --- a/headers/cpp/std/bastring.h +++ b/headers/cpp/std/bastring.h @@ -407,7 +407,13 @@ public: 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 int compare (const charT* s, size_type pos, size_type n) const; + + // Correct std C++ prototype + 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 { return compare (s, pos, traits::length (s)); }