asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove CHARTYPE_16BITS unused checks

Browse source 
fix #5263
This commit is contained in:
J08nY 2016-06-19 00:05:23 +02:00
parent b587a13293
commit a95a1f47a4
No known key found for this signature in database
GPG key ID: 7F4A448FE68F329D
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/ustring.h
View file

@ -46,11 +46,9 @@ public:
operator const char*() {return get_data();}; operator const char*() {return get_data();};
}; };
#ifndef CHARTYPE_16BITS
typedef wchar_t CharType; typedef wchar_t CharType;
#else
typedef wchar_t uint16_t;
#endif
struct StrRange { struct StrRange {

4
core/variant.cpp
View file

@ -1445,12 +1445,12 @@ Variant::operator unsigned char() const {
return 0; return 0;
} }
#ifndef CHARTYPE_16BITS
Variant::operator CharType() const { Variant::operator CharType() const {
return operator unsigned int(); return operator unsigned int();
} }
#endif
Variant::operator float() const { Variant::operator float() const {

3
core/variant.h
View file

@ -202,9 +202,8 @@ public:
operator unsigned long() const; operator unsigned long() const;
#endif #endif
#ifndef CHARTYPE_16BITS
operator CharType() const; operator CharType() const;
#endif
operator float() const; operator float() const;
operator double() const; operator double() const;
operator String() const; operator String() const;