diff options
author | J08nY <johny@neuromancer.sk> | 2016-06-19 00:05:23 +0200 |
---|---|---|
committer | J08nY <johny@neuromancer.sk> | 2016-06-19 00:12:31 +0200 |
commit | a95a1f47a45a5d8595c6681c28abd31ab0635479 (patch) | |
tree | 9b55ce67b25922b5b5f4f0c470ad082e4f8c0fcf /core | |
parent | b587a13293840975b53bad3392374ad30a578064 (diff) |
Remove CHARTYPE_16BITS unused checks
fix #5263
Diffstat (limited to 'core')
-rw-r--r-- | core/ustring.h | 6 | ||||
-rw-r--r-- | core/variant.cpp | 4 | ||||
-rw-r--r-- | core/variant.h | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/core/ustring.h b/core/ustring.h index 95096e8f76..8aceb0748c 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -46,11 +46,9 @@ public: operator const char*() {return get_data();}; }; -#ifndef CHARTYPE_16BITS + typedef wchar_t CharType; -#else -typedef wchar_t uint16_t; -#endif + struct StrRange { diff --git a/core/variant.cpp b/core/variant.cpp index 472d6cf568..81d10f379a 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1445,12 +1445,12 @@ Variant::operator unsigned char() const { return 0; } -#ifndef CHARTYPE_16BITS + Variant::operator CharType() const { return operator unsigned int(); } -#endif + Variant::operator float() const { diff --git a/core/variant.h b/core/variant.h index b95223ecfb..5ddfe40398 100644 --- a/core/variant.h +++ b/core/variant.h @@ -202,9 +202,8 @@ public: operator unsigned long() const; #endif -#ifndef CHARTYPE_16BITS + operator CharType() const; -#endif operator float() const; operator double() const; operator String() const; |