From 691e517bbdd54eec2f197ba9996a50c4d20f80af Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 12 Nov 2015 22:24:16 +0100 Subject: [PATCH] build fix. * can't use min here, this header is not supposed to #include . --- headers/cpp/std/bastring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headers/cpp/std/bastring.h b/headers/cpp/std/bastring.h index ce57ea3414..59eceab5a1 100644 --- a/headers/cpp/std/bastring.h +++ b/headers/cpp/std/bastring.h @@ -420,7 +420,7 @@ public: int compare (size_type pos, size_type n, const charT* s) const { return compare(s, pos, n); } int compare (size_type pos, size_type n, const charT* s, size_type n2) const - { return compare(s, pos, std::min(n, n2)); } + { if (n > n2) n = n2; return compare(s, pos, n); } int compare (const charT* s, size_type pos = 0) const { return compare (s, pos, traits::length (s)); }