[Bf-blender-cvs] [4e9e44ad28f] master: Cleanup: improve asserts in generic span
Jacques Lucke
noreply at git.blender.org
Thu Jul 7 19:27:40 CEST 2022
Commit: 4e9e44ad28fc7a48e0d74a9f752847eb7be4e662
Author: Jacques Lucke
Date: Thu Jul 7 19:27:30 2022 +0200
Branches: master
https://developer.blender.org/rB4e9e44ad28fc7a48e0d74a9f752847eb7be4e662
Cleanup: improve asserts in generic span
===================================================================
M source/blender/blenlib/BLI_generic_span.hh
===================================================================
diff --git a/source/blender/blenlib/BLI_generic_span.hh b/source/blender/blenlib/BLI_generic_span.hh
index 0a40201634a..143ab235d2e 100644
--- a/source/blender/blenlib/BLI_generic_span.hh
+++ b/source/blender/blenlib/BLI_generic_span.hh
@@ -28,7 +28,8 @@ class GSpan {
{
BLI_assert(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)
@@ -119,7 +120,8 @@ class GMutableSpan {
{
BLI_assert(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)
More information about the Bf-blender-cvs
mailing list