From e89f047e09f5307be526cd799504b10f2015c417 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 28 Mar 2017 11:38:34 +0100 Subject: [PATCH] Warning fix for VS2017, don't call toupper/tolower as they're int -> int --- renderdoc/serialise/string_utils.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/renderdoc/serialise/string_utils.cpp b/renderdoc/serialise/string_utils.cpp index dfc78ad3f..52dbc6f18 100644 --- a/renderdoc/serialise/string_utils.cpp +++ b/renderdoc/serialise/string_utils.cpp @@ -47,10 +47,21 @@ uint32_t strhash(const char *str, uint32_t seed) return hash; } +// since tolower is int -> int, this warns below. make a char -> char alternative +char toclower(char c) +{ + return (char)tolower(c); +} + +char tocupper(char c) +{ + return (char)toupper(c); +} + string strlower(const string &str) { string newstr(str); - transform(newstr.begin(), newstr.end(), newstr.begin(), tolower); + transform(newstr.begin(), newstr.end(), newstr.begin(), toclower); return newstr; } @@ -64,7 +75,7 @@ wstring strlower(const wstring &str) string strupper(const string &str) { string newstr(str); - transform(newstr.begin(), newstr.end(), newstr.begin(), toupper); + transform(newstr.begin(), newstr.end(), newstr.begin(), tocupper); return newstr; }