From 1967c348184a35007b7fce5da81d7874a51edc3e Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 6 Oct 2016 13:53:02 +1100 Subject: Move MakeLowerCase into CharacterSet.h as that is where MakeUpperCase is. Change the argument and return type of MakeUpperCase to match MakeLowerCase. Move StyleContext::MatchIgnoreCase into StyleContext.cxx as the change of header for MakeLowerCase couldn't be reconciled easily. Add casts as needed. --- lexlib/CharacterSet.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lexlib/CharacterSet.cxx') diff --git a/lexlib/CharacterSet.cxx b/lexlib/CharacterSet.cxx index 0ab2cc0cc..55602af30 100644 --- a/lexlib/CharacterSet.cxx +++ b/lexlib/CharacterSet.cxx @@ -25,8 +25,8 @@ namespace Scintilla { int CompareCaseInsensitive(const char *a, const char *b) { while (*a && *b) { if (*a != *b) { - char upperA = MakeUpperCase(*a); - char upperB = MakeUpperCase(*b); + char upperA = static_cast(MakeUpperCase(*a)); + char upperB = static_cast(MakeUpperCase(*b)); if (upperA != upperB) return upperA - upperB; } @@ -40,8 +40,8 @@ int CompareCaseInsensitive(const char *a, const char *b) { int CompareNCaseInsensitive(const char *a, const char *b, size_t len) { while (*a && *b && len) { if (*a != *b) { - char upperA = MakeUpperCase(*a); - char upperB = MakeUpperCase(*b); + char upperA = static_cast(MakeUpperCase(*a)); + char upperB = static_cast(MakeUpperCase(*b)); if (upperA != upperB) return upperA - upperB; } -- cgit v1.2.3