From 26c981f7fa89f20ee351df8faba26dc1a4598783 Mon Sep 17 00:00:00 2001
From: Vittorio Romeo <mail@vittorioromeo.com>
Date: Sun, 15 Sep 2024 18:25:29 +0200
Subject: [PATCH] Try to fix CI

---
 CMakeLists.txt                           | 2 +-
 src/cpptrace.cpp                         | 1 +
 src/platform/dbghelp_syminit_manager.hpp | 2 ++
 src/symbols/symbols_core.cpp             | 2 ++
 src/unwind/unwind.hpp                    | 2 +-
 src/utils/microfmt.cpp                   | 3 +--
 src/utils/utils.cpp                      | 3 +--
 src/utils/utils.hpp                      | 1 +
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21bf152..ed06b94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,7 +248,7 @@ target_sources(
     src/unwind/unwind_with_winapi.cpp
     src/utils/microfmt.cpp
     src/utils/utils.cpp
-    src/platform/dbghelp_syminit_manager.cpp
+    $<$<BOOL:${WIN32}>:src/platform/dbghelp_syminit_manager.cpp>
 )
 
 target_include_directories(
diff --git a/src/cpptrace.cpp b/src/cpptrace.cpp
index b908ac5..ff4ce56 100644
--- a/src/cpptrace.cpp
+++ b/src/cpptrace.cpp
@@ -6,6 +6,7 @@
 #include <cstdio>
 #include <cstring>
 #include <iostream>
+#include <new>
 #include <sstream>
 #include <stdexcept>
 #include <string>
diff --git a/src/platform/dbghelp_syminit_manager.hpp b/src/platform/dbghelp_syminit_manager.hpp
index 7f5c626..9d91d84 100644
--- a/src/platform/dbghelp_syminit_manager.hpp
+++ b/src/platform/dbghelp_syminit_manager.hpp
@@ -6,6 +6,8 @@
 namespace cpptrace {
 namespace detail {
     struct dbghelp_syminit_manager {
+        // The set below contains Windows `HANDLE` objects, `void*` is used to avoid 
+        // including the (expensive) Windows header here
         std::unordered_set<void*> set;
 
         ~dbghelp_syminit_manager();
diff --git a/src/symbols/symbols_core.cpp b/src/symbols/symbols_core.cpp
index 43893da..6f27944 100644
--- a/src/symbols/symbols_core.cpp
+++ b/src/symbols/symbols_core.cpp
@@ -1,5 +1,7 @@
 #include "symbols/symbols.hpp"
 
+#include <cpptrace/cpptrace.hpp>
+
 #include <vector>
 #include <unordered_map>
 
diff --git a/src/unwind/unwind.hpp b/src/unwind/unwind.hpp
index 36e0afc..d37e836 100644
--- a/src/unwind/unwind.hpp
+++ b/src/unwind/unwind.hpp
@@ -1,7 +1,7 @@
 #ifndef UNWIND_HPP
 #define UNWIND_HPP
 
-#include "cpptrace/cpptrace.hpp"
+#include <cpptrace/cpptrace.hpp>
 
 #include <cstddef>
 #include <vector>
diff --git a/src/utils/microfmt.cpp b/src/utils/microfmt.cpp
index 60b58e7..4877732 100644
--- a/src/utils/microfmt.cpp
+++ b/src/utils/microfmt.cpp
@@ -5,8 +5,7 @@
 namespace cpptrace {
 namespace detail {
 
-    std::ostream& get_cout()
-    {
+    std::ostream& get_cout() {
         return std::cout;
     }
 
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index 2a95096..80de344 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -28,8 +28,7 @@ namespace detail {
         #endif
     }
 
-    void enable_virtual_terminal_processing_if_needed() noexcept
-    {
+    void enable_virtual_terminal_processing_if_needed() noexcept {
         // enable colors / ansi processing if necessary
         #if IS_WINDOWS
          // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#example-of-enabling-virtual-terminal-processing
diff --git a/src/utils/utils.hpp b/src/utils/utils.hpp
index 98e4129..ea2637d 100644
--- a/src/utils/utils.hpp
+++ b/src/utils/utils.hpp
@@ -8,6 +8,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <memory>
+#include <new>
 #include <string>
 #include <type_traits>
 #include <utility>