diff options
author | Julian Eisel <julian@blender.org> | 2020-10-03 17:01:59 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-10-03 17:10:15 +0300 |
commit | 0bae2662f455c2866ce769fdc73b3068f8239bd0 (patch) | |
tree | 49fc275077b4cc7ebb77086cbbcb661fd9b7227f /source/blender/blenkernel | |
parent | e839179b014a2dac2b5cab6425bf7c382b9b0d1c (diff) |
Cleanup: Remove/replace C standard library assert() and header usages
We have our own assert implementation, `BLI_assert()` that is prefered over the
C standard library one. Its output is more consistent across compilers and
makes termination on assert failure optional (through `WITH_ASSERT_ABORT`).
In many places we'd include the C library header without ever accessing it.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/bpath.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editmesh_tangent.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/unit.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/volume.cc | 2 |
8 files changed, 7 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 4ab8ea5a647..4ea9a26f0f8 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -27,7 +27,6 @@ #include <sys/stat.h> -#include <assert.h> #include <string.h> /* path/file handling stuff */ diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 7440cc1f735..fd5cb33f02d 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -21,7 +21,6 @@ * \ingroup bke */ -#include <assert.h> #include <math.h> #include <stdio.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c index 897fc7e692b..b3f6b543daf 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.c +++ b/source/blender/blenkernel/intern/editmesh_tangent.c @@ -104,7 +104,7 @@ static void emdm_ts_GetPosition(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - // assert(vert_index >= 0 && vert_index < 4); + // BLI_assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; @@ -138,7 +138,7 @@ static void emdm_ts_GetTextureCoordinate(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - // assert(vert_index >= 0 && vert_index < 4); + // BLI_assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; @@ -176,7 +176,7 @@ static void emdm_ts_GetNormal(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - // assert(vert_index >= 0 && vert_index < 4); + // BLI_assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; @@ -221,7 +221,7 @@ static void emdm_ts_SetTSpace(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - // assert(vert_index >= 0 && vert_index < 4); + // BLI_assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index f8f171bd9d7..675e3956102 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -24,7 +24,6 @@ * allocate and free of all library data */ -#include <assert.h> #include <ctype.h> #include <stddef.h> #include <stdio.h> diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index a04fa1506d0..d31b0d54784 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -36,8 +36,6 @@ #include "bmesh.h" #include "pbvh_intern.h" -#include <assert.h> - /* Avoid skinny faces */ #define USE_EDGEQUEUE_EVEN_SUBDIV #ifdef USE_EDGEQUEUE_EVEN_SUBDIV diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 0ff5bdda9e9..9240851c07a 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -21,7 +21,6 @@ * \ingroup bke */ -#include <assert.h> #include <float.h> #include <math.h> #include <memory.h> diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index bfa031f0d64..a5418b8b8c5 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -18,7 +18,6 @@ * \ingroup bke */ -#include <assert.h> #include <ctype.h> #include <stdio.h> #include <stdlib.h> @@ -395,7 +394,8 @@ static const struct bUnitCollection *bUnitSystems[][B_UNIT_TYPE_TOT] = { static const bUnitCollection *unit_get_system(int system, int type) { - assert((system > -1) && (system < UNIT_SYSTEM_TOT) && (type > -1) && (type < B_UNIT_TYPE_TOT)); + BLI_assert((system > -1) && (system < UNIT_SYSTEM_TOT) && (type > -1) && + (type < B_UNIT_TYPE_TOT)); return bUnitSystems[system][type]; /* Select system to use: metric/imperial/other? */ } diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 6394cfe39a6..79ed3d3d08d 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -154,7 +154,7 @@ static struct VolumeFileCache { ~VolumeFileCache() { - assert(cache.empty()); + BLI_assert(cache.empty()); } Entry *add_metadata_user(const Entry &template_entry) |