From afe61eb994377e25d60d0a0893510a693149c6be Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Sep 2008 01:53:11 +0000 Subject: QAR-849 merge maint-viewer-10-merge 96838-97237 -> release --- indra/llcommon/llstring.h | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 475531a2ad..1a60a35c2c 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -133,26 +133,32 @@ struct char_traits class LLStringOps { public: - static char toUpper(char elem) { return toupper(elem); } + static char toUpper(char elem) { return toupper((unsigned char)elem); } static llwchar toUpper(llwchar elem) { return towupper(elem); } - static char toLower(char elem) { return tolower(elem); } + static char toLower(char elem) { return tolower((unsigned char)elem); } static llwchar toLower(llwchar elem) { return towlower(elem); } - static BOOL isSpace(char elem) { return isspace(elem) != 0; } - static BOOL isSpace(llwchar elem) { return iswspace(elem) != 0; } + static bool isSpace(char elem) { return isspace((unsigned char)elem) != 0; } + static bool isSpace(llwchar elem) { return iswspace(elem) != 0; } - static BOOL isUpper(char elem) { return isupper(elem) != 0; } - static BOOL isUpper(llwchar elem) { return iswupper(elem) != 0; } + static bool isUpper(char elem) { return isupper((unsigned char)elem) != 0; } + static bool isUpper(llwchar elem) { return iswupper(elem) != 0; } - static BOOL isLower(char elem) { return islower(elem) != 0; } - static BOOL isLower(llwchar elem) { return iswlower(elem) != 0; } + static bool isLower(char elem) { return islower((unsigned char)elem) != 0; } + static bool isLower(llwchar elem) { return iswlower(elem) != 0; } + + static bool isDigit(char a) { return isdigit((unsigned char)a) != 0; } + static bool isDigit(llwchar a) { return iswdigit(a) != 0; } + + static bool isPunct(char a) { return ispunct((unsigned char)a) != 0; } + static bool isPunct(llwchar a) { return iswpunct(a) != 0; } + + static bool isAlnum(char a) { return isalnum((unsigned char)a) != 0; } + static bool isAlnum(llwchar a) { return iswalnum(a) != 0; } static S32 collate(const char* a, const char* b) { return strcoll(a, b); } static S32 collate(const llwchar* a, const llwchar* b); - - static BOOL isDigit(char a) { return isdigit(a) != 0; } - static BOOL isDigit(llwchar a) { return iswdigit(a) != 0; } }; // Allowing assignments from non-strings into format_map_t is apparently @@ -180,7 +186,7 @@ public: typedef std::map format_map_t; static S32 format(std::basic_string& s, const format_map_t& fmt_map); - static BOOL isValidIndex(const std::basic_string& string, size_type i) + static bool isValidIndex(const std::basic_string& string, size_type i) { return !string.empty() && (0 <= i) && (i <= string.size()); } -- cgit v1.3