From eb928fea3332bf15f83802ae04f96915c3ebd21c Mon Sep 17 00:00:00 2001
From: sopiro <sopiro.ldh@gmail.com>
Date: Sat, 11 May 2024 13:59:55 +0900
Subject: [PATCH] Organize code

---
 include/salloc/linear_allocator.h  |  2 +-
 src/CMakeLists.txt                 | 10 +++++-----
 src/linear_allocator.cpp           |  3 +--
 src/predefined_block_allocator.cpp |  4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/salloc/linear_allocator.h b/include/salloc/linear_allocator.h
index 8f0f41e..c9d352d 100644
--- a/include/salloc/linear_allocator.h
+++ b/include/salloc/linear_allocator.h
@@ -9,7 +9,7 @@ namespace salloc
 class LinearAllocator : public Allocator
 {
 public:
-    LinearAllocator(size_t initialCapacity = 10 * 1024);
+    LinearAllocator(size_t initialCapacity = 16 * 1024);
     ~LinearAllocator();
 
     virtual void* Allocate(size_t size) override;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f9e236c..ad28d67 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,8 +29,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     CXX_EXTENSIONS NO
 )
 
-# if(MSVC)
-#     target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
-# else()
-#     target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic -Werror)
-# endif()
+if(MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+else()
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic -Werror)
+endif()
diff --git a/src/linear_allocator.cpp b/src/linear_allocator.cpp
index df1e458..2847a92 100644
--- a/src/linear_allocator.cpp
+++ b/src/linear_allocator.cpp
@@ -107,9 +107,8 @@ bool LinearAllocator::GrowMemory()
 
 void LinearAllocator::Clear()
 {
-    index = 0;
     entryCount = 0;
-    entryCapacity = 0;
+    index = 0;
     allocation = 0;
     maxAllocation = 0;
 }
diff --git a/src/predefined_block_allocator.cpp b/src/predefined_block_allocator.cpp
index 5e6a6e7..87df566 100644
--- a/src/predefined_block_allocator.cpp
+++ b/src/predefined_block_allocator.cpp
@@ -4,11 +4,11 @@ namespace salloc
 {
 
 PredefinedBlockAllocator::PredefinedBlockAllocator(size_t initialChunkSize, std::span<size_t> blockSizes)
-    : blockCount{ 0 }
+    : sizeMap(std::move(blockSizes))
+    , blockCount{ 0 }
     , chunkCount{ 0 }
     , chunkSize{ initialChunkSize }
     , chunks{ nullptr }
-    , sizeMap(std::move(blockSizes))
 {
     freeList = (Block**)salloc::Alloc(sizeMap.sizes.size() * sizeof(Block*));
     memset(freeList, 0, sizeMap.sizes.size() * sizeof(Block*));