aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c12
-rw-r--r--src/scoped_allocator.c4
2 files changed, 0 insertions, 16 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 490418a..ad50771 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -10,19 +10,7 @@ int buffer_init(Buffer *self, ScopedAllocator *allocator, usize initial_capacity
return scoped_allocator_alloc(self->allocator, initial_capacity, (void**)&self->data);
}
-<<<<<<< HEAD
-void buffer_deinit(Buffer *self) {
- am_free(self->data);
- self->data = NULL;
- self->size = 0;
- self->capacity = 0;
-}
-
-static CHECK_RESULT int buffer_ensure_capacity_for(Buffer *self, usize size) {
- usize capacity;
-=======
static CHECK_RESULT int buffer_ensure_capacity_for(Buffer *self, usize size) {
->>>>>>> Fixed CHECK_RESULT macro, use scoped allocator
void *new_mem;
int alloc_result;
usize new_capacity;
diff --git a/src/scoped_allocator.c b/src/scoped_allocator.c
index bd14206..cbf1aad 100644
--- a/src/scoped_allocator.c
+++ b/src/scoped_allocator.c
@@ -2,11 +2,7 @@
#include "../include/alloc.h"
#include <assert.h>
-<<<<<<< HEAD
-#define ALLOC_NODE_SIZE 4096
-=======
#define ALLOC_NODE_SIZE 65536
->>>>>>> Fixed CHECK_RESULT macro, use scoped allocator
int scoped_allocator_node_init(ScopedAllocatorNode *self) {
self->data = NULL;