diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-16 11:20:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 11:20:52 -0700 |
| commit | aff3dd36bad5cbffb5a995ed63eb67ad099e60e0 (patch) | |
| tree | 17d506a0c024c192e3ba77cc60a11496ae538d1c | |
| parent | e5a310cd38f087f4158a04a32d631f420e1236d1 (diff) | |
| parent | 4121df235ee49471f30089a2d6b6e081536852ba (diff) | |
Merge pull request #25495 from IronicallySerious/fix-expand-macros
Fix parameterised macros in core. Addresses #25488
| -rw-r--r-- | core/io/logger.cpp | 2 | ||||
| -rw-r--r-- | core/math/geometry.cpp | 2 | ||||
| -rw-r--r-- | core/typedefs.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/io/logger.cpp b/core/io/logger.cpp index eeb82bfce4..9175f6a262 100644 --- a/core/io/logger.cpp +++ b/core/io/logger.cpp @@ -39,7 +39,7 @@ // va_copy, otherwise you have to use the internal version (__va_copy). #if !defined(va_copy) #if defined(__GNUC__) -#define va_copy(d, s) __va_copy(d, s) +#define va_copy(d, s) __va_copy((d), (s)) #else #define va_copy(d, s) ((d) = (s)) #endif diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index 194a6f6352..a84b5a16c7 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -515,7 +515,7 @@ static inline void _build_faces(uint8_t ***p_cell_status, int x, int y, int z, i Vector3(1,1,1), }; */ -#define vert(m_idx) Vector3((m_idx & 4) >> 2, (m_idx & 2) >> 1, m_idx & 1) +#define vert(m_idx) Vector3(((m_idx)&4) >> 2, ((m_idx)&2) >> 1, (m_idx)&1) static const uint8_t indices[6][4] = { { 7, 6, 4, 5 }, diff --git a/core/typedefs.h b/core/typedefs.h index 03514466c0..78688ff311 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -137,7 +137,7 @@ T *_nullptr() { /** Generic swap template */ #ifndef SWAP -#define SWAP(m_x, m_y) __swap_tmpl(m_x, m_y) +#define SWAP(m_x, m_y) __swap_tmpl((m_x), (m_y)) template <class T> inline void __swap_tmpl(T &x, T &y) { |