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

Merge pull request #5281 from J08nY/useless-preprocessor

Browse source 
Fix #5263: Useless preprocessor condition
This commit is contained in:
Rémi Verschelde 2016-06-19 13:09:25 +02:00 committed by GitHub
commit df202127e3
4 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/math/vector3.h
View file

@ -44,18 +44,6 @@ struct Vector3 {
};
union {
#ifdef USE_QUAD_VECTORS
struct {
real_t x;
real_t y;
real_t z;
real_t _unused;
};
real_t coord[4];
#else
struct {
real_t x;
real_t y;
@ -63,7 +51,6 @@ struct Vector3 {
};
real_t coord[3];
#endif
};
_FORCE_INLINE_ const real_t& operator[](int p_axis) const {

6
core/ustring.h
View file

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

4
core/variant.cpp
View file

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

7
core/variant.h
View file

@ -151,11 +151,7 @@ private:
InputEvent *_input_event;
Image *_image;
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)];
#endif
} _data;
@ -202,9 +198,8 @@ public:
operator unsigned long() const;
#endif
#ifndef CHARTYPE_16BITS
operator CharType() const;
#endif
operator float() const;
operator double() const;
operator String() const;