diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-05 16:49:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-05 16:49:13 +0400 |
| commit | 83617429cf28f2a19e991a0f71d892fc159a4419 (patch) | |
| tree | 0926334def4434fa64e6151848ce6f133aa86168 /source/blender | |
| parent | 28f893f23aeb18a2cfe70fe32d61d67ea74edec1 (diff) | |
Fix build warnings with clang and UNUSED_RESULT_ATTR (attribute declaration must precede definition).
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_math_vector.h | 10 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index e05783004c7..e163c06440c 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -36,10 +36,6 @@ extern "C" { #include "BLI_math_inline.h" -#if BLI_MATH_DO_INLINE -#include "intern/math_vector_inline.c" -#endif - /************************************* Init ***********************************/ #ifdef BLI_MATH_GCC_WARN_PRAGMA @@ -286,6 +282,12 @@ void fill_vn_i(int *array_tar, const int size, const int val); void fill_vn_ushort(unsigned short *array_tar, const int size, const unsigned short val); void fill_vn_fl(float *array_tar, const int size, const float val); +/**************************** Inline Definitions ******************************/ + +#if BLI_MATH_DO_INLINE +#include "intern/math_vector_inline.c" +#endif + #ifdef BLI_MATH_GCC_WARN_PRAGMA # pragma GCC diagnostic pop #endif diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 269a10749dc..8d3c47d2cd1 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1420,7 +1420,9 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e) e->l = NULL; if (l_next) { BMLoop *l_new, *l; +#ifndef NDEBUG int radlen = bmesh_radial_length(l_next); +#endif int first1 = 0, first2 = 0; /* Take the next loop. Remove it from radial. Split it. Append to appropriate radials */ |