Browse Source

Revert "Update `mem.nil_allocator` to match the same in `runtime`"

The change broke JSON unmarshaling.

This reverts commit 4484a3433d6c58f1d1c594a4c36317f323cb5102.
Jeroen van Rijn 3 years ago
parent
commit
7654afc2db
1 changed files with 1 additions and 18 deletions
  1. 1 18
      core/mem/allocators.odin

+ 1 - 18
core/mem/allocators.odin

@@ -6,24 +6,7 @@ import "core:runtime"
 nil_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
                            size, alignment: int,
                            old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) {
-	switch mode {
-	case .Alloc:
-		return nil, .Out_Of_Memory
-	case .Free:
-		return nil, .None
-	case .Free_All:
-		return nil, .Mode_Not_Implemented
-	case .Resize:
-		if size == 0 {
-			return nil, .None
-		}
-		return nil, .Out_Of_Memory
-	case .Query_Features:
-		return nil, .Mode_Not_Implemented
-	case .Query_Info:
-		return nil, .Mode_Not_Implemented
-	}
-	return nil, .None
+	return nil, nil
 }
 
 nil_allocator :: proc() -> Allocator {