From a95a1f47a45a5d8595c6681c28abd31ab0635479 Mon Sep 17 00:00:00 2001 From: J08nY Date: Sun, 19 Jun 2016 00:05:23 +0200 Subject: Remove CHARTYPE_16BITS unused checks fix #5263 --- core/ustring.h | 6 ++---- core/variant.cpp | 4 ++-- 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; -- cgit v1.2.3