Browse Source

Change `default_temp_allocator_proc` behaviour to use the `default_allocator` when the backing data has not been set.

gingerBill 4 years ago
parent
commit
92431c83ec
1 changed files with 1 additions and 6 deletions
  1. 1 6
      core/runtime/default_allocators.odin

+ 1 - 6
core/runtime/default_allocators.odin

@@ -65,12 +65,7 @@ default_temp_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode
 	s := (^Default_Temp_Allocator)(allocator_data);
 	s := (^Default_Temp_Allocator)(allocator_data);
 
 
 	if s.data == nil {
 	if s.data == nil {
-		a := context.allocator;
-		if !(context.allocator.procedure != default_temp_allocator_proc &&
-		     context.allocator.data != allocator_data) {
-			a = default_allocator();
-		}
-		default_temp_allocator_init(s, DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, a);
+		default_temp_allocator_init(s, DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, default_allocator());
 	}
 	}
 
 
 	size := size;
 	size := size;