aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2021-08-26 15:41:32 +0100
committergingerBill <bill@gingerbill.org>2021-08-26 15:41:32 +0100
commit3e4d615983f76616b5a598b89b75aa84975a4aab (patch)
tree304f5b8a33d5bfa74f0364f42aa4cc4eaedaf5f6
parentaa8777ee47f503eb90d4e2225274d0d20a9b39a3 (diff)
Minor fixes
-rw-r--r--src/build_settings.cpp4
-rw-r--r--src/common.cpp6
-rw-r--r--src/common_memory.cpp8
3 files changed, 6 insertions, 12 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 841870fec..f3cc45ae8 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -609,7 +609,6 @@ String path_to_fullpath(gbAllocator a, String s);
String internal_odin_root_dir(void) {
String path = global_module_path;
isize len, i;
- gbTempArenaMemory tmp;
u8 *text;
if (global_module_path_set) {
@@ -652,9 +651,6 @@ String internal_odin_root_dir(void) {
mutex_lock(&string_buffer_mutex);
defer (mutex_unlock(&string_buffer_mutex));
- tmp = gb_temp_arena_memory_begin(&string_buffer_arena);
- defer (gb_temp_arena_memory_end(tmp));
-
text = gb_alloc_array(permanent_allocator(), u8, len + 1);
gb_memmove(text, &path_buf[0], len);
diff --git a/src/common.cpp b/src/common.cpp
index eeadc71bc..af0a195a8 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -33,8 +33,12 @@ gbAllocator heap_allocator(void);
#define for_array(index_, array_) for (isize index_ = 0; index_ < (array_).count; index_++)
-#include "threading.cpp"
+i32 next_pow2(i32 n);
+i64 next_pow2(i64 n);
+isize next_pow2_isize(isize n);
+void debugf(char const *fmt, ...);
+#include "threading.cpp"
#include "unicode.cpp"
#include "array.cpp"
#include "queue.cpp"
diff --git a/src/common_memory.cpp b/src/common_memory.cpp
index ef46dcaa6..afdcb2dee 100644
--- a/src/common_memory.cpp
+++ b/src/common_memory.cpp
@@ -6,11 +6,6 @@ gb_inline void zero_size(void *ptr, isize len) {
#define zero_item(ptr) zero_size((ptr), gb_size_of(ptr))
-i32 next_pow2(i32 n);
-i64 next_pow2(i64 n);
-isize next_pow2_isize(isize n);
-void debugf(char const *fmt, ...);
-
template <typename U, typename V>
gb_inline U bit_cast(V &v) { return reinterpret_cast<U &>(v); }
@@ -64,7 +59,6 @@ struct MemoryBlock {
struct Arena {
MemoryBlock * curr_block;
isize minimum_block_size;
- isize temporary_memory_count;
};
enum { DEFAULT_MINIMUM_BLOCK_SIZE = 8ll*1024ll*1024ll };
@@ -213,7 +207,7 @@ void platform_virtual_memory_init(void) {
}
-MemoryBlock *virtual_memory_alloc(isize size, MemoryBlockFlags flags) {
+MemoryBlock *virtual_memory_alloc(isize size) {
return nullptr;
}