griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: improve asserts in generic span

Browse Source
This commit is contained in:
Jacques Lucke
2022-07-07 19:27:30 +02:00
parent ba62e20af6
commit 4e9e44ad28
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_generic_span.hh
View File

@@ -28,7 +28,8 @@ class GSpan {
{ {
BLI_assert(size >= 0); BLI_assert(size >= 0);
BLI_assert(buffer != nullptr || size == 0); BLI_assert(buffer != nullptr || size == 0);
BLI_assert(type->pointer_has_valid_alignment(buffer)); BLI_assert(size == 0 || type != nullptr);
BLI_assert(type == nullptr || type->pointer_has_valid_alignment(buffer));
} }
GSpan(const CPPType &type, const void *buffer, int64_t size) : GSpan(&type, buffer, size) GSpan(const CPPType &type, const void *buffer, int64_t size) : GSpan(&type, buffer, size)
@@ -119,7 +120,8 @@ class GMutableSpan {
{ {
BLI_assert(size >= 0); BLI_assert(size >= 0);
BLI_assert(buffer != nullptr || size == 0); BLI_assert(buffer != nullptr || size == 0);
BLI_assert(type->pointer_has_valid_alignment(buffer)); BLI_assert(size == 0 || type != nullptr);
BLI_assert(type == nullptr || type->pointer_has_valid_alignment(buffer));
} }
GMutableSpan(const CPPType &type, void *buffer, int64_t size) : GMutableSpan(&type, buffer, size) GMutableSpan(const CPPType &type, void *buffer, int64_t size) : GMutableSpan(&type, buffer, size)