2
0
Эх сурвалжийг харах

Remove CHARTYPE_16BITS unused checks

fix #5263
J08nY 9 жил өмнө
parent
commit
a95a1f47a4

+ 2 - 4
core/ustring.h

@@ -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 {
 
 

+ 2 - 2
core/variant.cpp

@@ -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 {
 
 

+ 1 - 2
core/variant.h

@@ -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;