From 8549eb174532e8e7ff036250c007f07d9cda5a5e Mon Sep 17 00:00:00 2001
From: Aras Pranckevicius <aras@nesnausk.org>
Date: Sat, 5 Aug 2023 13:46:23 +0300
Subject: [PATCH] Cleanup includes

---
 CMakeLists.txt    |  1 -
 changelog.md      |  6 ++++++
 src/debuginfo.cpp |  4 +---
 src/debuginfo.hpp | 11 ++++-------
 src/pdbfile.cpp   |  1 -
 src/types.hpp     | 14 --------------
 6 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 src/types.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4597e0..58644ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ add_executable (Sizer
 	src/pdbfile.hpp
 	src/pe_utils.cpp
 	src/pe_utils.hpp
-	src/types.hpp
 
 	src/raw_pdb
 	src/raw_pdb/Foundation
diff --git a/changelog.md b/changelog.md
index ddfb2b9..5a787fd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+### 0.5.1, 2023 Aug 5
+
+- Sizer now builds on Windows, Mac and Linux. Note that it still only analyzes the *Windows* executables/PDBs, but can do that while running on Mac/Linux.
+- The build system was changed to CMake.
+- Github Actions was added, which also builds the Sizer executable across all of Windows/Mac/Linux platforms.
+
 ### 0.5.0, 2023 Aug 4
 
 Large speedup and removed dependency on `msdia*.dll`, by switching to [MolecularMatters/raw_pdb](https://github.com/MolecularMatters/raw_pdb)
diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
index eaeb011..a3e7139 100644
--- a/src/debuginfo.cpp
+++ b/src/debuginfo.cpp
@@ -3,13 +3,11 @@
 // Based on code by Fabian "ryg" Giesen, http://farbrausch.com/~fg/
 // Public domain.
 
-#include "types.hpp"
 #include "debuginfo.hpp"
 #include <stdarg.h>
 #include <algorithm>
 #include <map>
-
-/****************************************************************************/
+#include <string.h>
 
 uint32_t DebugInfo::CountSizeInClass(int32_t type) const
 {
diff --git a/src/debuginfo.hpp b/src/debuginfo.hpp
index a24af78..e1e152b 100644
--- a/src/debuginfo.hpp
+++ b/src/debuginfo.hpp
@@ -6,12 +6,9 @@
 #ifndef __DEBUGINFO_HPP__
 #define __DEBUGINFO_HPP__
 
-#include "types.hpp"
 #include <map>
-
-using std::string;
-
-/****************************************************************************/
+#include <string>
+#include <vector>
 
 #define DIC_END     0
 #define DIC_CODE    1
@@ -68,8 +65,8 @@ struct DebugFilters
 
 class DebugInfo
 {
-    typedef std::vector<string>   StringByIndexVector;
-    typedef std::map<string, int32_t> IndexByStringMap;
+    typedef std::vector<std::string>   StringByIndexVector;
+    typedef std::map<std::string, int32_t> IndexByStringMap;
     typedef std::map<int32_t, int32_t> NameIndexToArrayIndexMap;
 
     StringByIndexVector m_StringByIndex;
diff --git a/src/pdbfile.cpp b/src/pdbfile.cpp
index 225d8b8..a764228 100644
--- a/src/pdbfile.cpp
+++ b/src/pdbfile.cpp
@@ -3,7 +3,6 @@
 // Based on code by Fabian "ryg" Giesen, http://farbrausch.com/~fg/
 // Public domain.
 
-#include "types.hpp"
 #include "debuginfo.hpp"
 #include "pdbfile.hpp"
 
diff --git a/src/types.hpp b/src/types.hpp
deleted file mode 100644
index 902ddd0..0000000
--- a/src/types.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Executable size report utility.
-// Aras Pranckevicius, https://aras-p.info/projSizer.html
-// Based on code by Fabian "ryg" Giesen, http://farbrausch.com/~fg/
-// Public domain.
-
-#pragma once
-#include <vector>
-#include <cstring>
-#include <string>
-#include <cassert>
-
-#pragma warning(disable:4018)
-#pragma warning(disable:4267)
-#pragma warning(disable:4244)