diff --git a/transcoder/basisu_containers_impl.h b/transcoder/basisu_containers_impl.h index b66efc9..aafb751 100644 --- a/transcoder/basisu_containers_impl.h +++ b/transcoder/basisu_containers_impl.h @@ -47,10 +47,10 @@ namespace basisu // Basic sanity check min_new_capacity if (!can_fit_into_size_t((uint64_t)min_new_capacity * element_size)) { - assert(0); - if (nofail_flag) return false; + + assert(0); container_abort("elemental_vector::increase_capacity: requesting too many elements\n"); } @@ -79,11 +79,11 @@ namespace basisu if (!can_fit_into_size_t(new_capacity_u64)) { - assert(0); - if (nofail_flag) return false; + assert(0); + container_abort("elemental_vector::increase_capacity: vector too large\n"); } } @@ -92,11 +92,11 @@ namespace basisu if (!can_fit_into_size_t(desired_size_u64)) { - assert(0); - if (nofail_flag) return false; + assert(0); + container_abort("elemental_vector::increase_capacity: vector too large\n"); } @@ -111,11 +111,11 @@ namespace basisu if (!new_p) { fprintf(stderr, "elemental_vector::increase_capacity: Allocation failed!\n"); - assert(0); - if (nofail_flag) return false; + assert(0); + container_abort("elemental_vector::increase_capacity: realloc() failed allocating %zu bytes", desired_size); } @@ -136,11 +136,11 @@ namespace basisu if (!new_p) { fprintf(stderr, "elemental_vector::increase_capacity: Allocation failed!\n"); - assert(0); - if (nofail_flag) return false; + assert(0); + container_abort("elemental_vector::increase_capacity: malloc() failed allocating %zu bytes", desired_size); }