Merge pull request #5281 from J08nY/useless-preprocessor
Fix #5263: Useless preprocessor condition
This commit is contained in:
commit
df202127e3
@ -44,18 +44,6 @@ struct Vector3 {
|
|||||||
};
|
};
|
||||||
|
|
||||||
union {
|
union {
|
||||||
|
|
||||||
#ifdef USE_QUAD_VECTORS
|
|
||||||
|
|
||||||
struct {
|
|
||||||
real_t x;
|
|
||||||
real_t y;
|
|
||||||
real_t z;
|
|
||||||
real_t _unused;
|
|
||||||
};
|
|
||||||
real_t coord[4];
|
|
||||||
#else
|
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
real_t x;
|
real_t x;
|
||||||
real_t y;
|
real_t y;
|
||||||
@ -63,7 +51,6 @@ struct Vector3 {
|
|||||||
};
|
};
|
||||||
|
|
||||||
real_t coord[3];
|
real_t coord[3];
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
_FORCE_INLINE_ const real_t& operator[](int p_axis) const {
|
_FORCE_INLINE_ const real_t& operator[](int p_axis) const {
|
||||||
|
@ -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 {
|
||||||
|
|
||||||
|
@ -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 {
|
||||||
|
|
||||||
|
@ -151,11 +151,7 @@ private:
|
|||||||
InputEvent *_input_event;
|
InputEvent *_input_event;
|
||||||
Image *_image;
|
Image *_image;
|
||||||
void *_ptr; //generic pointer
|
void *_ptr; //generic pointer
|
||||||
#ifdef USE_QUAD_VECTORS
|
|
||||||
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*5) ? sizeof(ObjData) : (sizeof(real_t)*5)]; // plane uses an extra real
|
|
||||||
#else
|
|
||||||
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*4) ? sizeof(ObjData) : (sizeof(real_t)*4)];
|
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*4) ? sizeof(ObjData) : (sizeof(real_t)*4)];
|
||||||
#endif
|
|
||||||
} _data;
|
} _data;
|
||||||
|
|
||||||
|
|
||||||
@ -202,9 +198,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user