From dcb5eaef87ec5fd0709654b08ab39d8f0dfc4be3 Mon Sep 17 00:00:00 2001
From: Adrien Blanchet <adrien.blanchet@live.fr>
Date: Tue, 23 May 2023 11:16:38 +0200
Subject: [PATCH] Make sure used std includes are the system ones and called in
 the right order

---
 include/Logger.h                          |  4 ++--
 include/implementation/Logger.impl.h      | 21 ++++++++++-----------
 include/implementation/LoggerUtils.h      | 10 +++++-----
 include/implementation/LoggerUtils.impl.h | 10 +++++-----
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/include/Logger.h b/include/Logger.h
index 54261df..e7f0ad8 100644
--- a/include/Logger.h
+++ b/include/Logger.h
@@ -12,11 +12,11 @@
 #include "implementation/LoggerParameters.h"
 #include "implementation/LoggerUtils.h"
 
-#include <string>
 #include <mutex>
+#include <string>
 #include <vector>
+#include <sstream>
 #include <unordered_set>
-#include "sstream"
 
 
 // Here is what you want to use
diff --git a/include/implementation/Logger.impl.h b/include/implementation/Logger.impl.h
index 8a22966..f9e9724 100644
--- a/include/implementation/Logger.impl.h
+++ b/include/implementation/Logger.impl.h
@@ -9,24 +9,23 @@
 
 #include "LoggerParameters.h"
 
-#include <cstdarg>
-#include <cstdio>
+#include <map>
+#include <mutex>
+#include <cmath>        // std::abs
 #include <ctime>
+#include <cstdio>
+#include <memory>    // For std::unique_ptr
 #include <string>
-#include <utility>
 #include <vector>
 #include <thread>
-#include <map>
-#include <mutex>
-#include <type_traits>
+#include <cstdio>
+#include <cstdarg>
+#include <utility>
 #include <sstream>
-#include <iostream>
 #include <iomanip>
-#include <algorithm>
-#include <memory>    // For std::unique_ptr
-#include <cmath>        // std::abs
-#include <cstdio>
 #include <iostream>
+#include <algorithm>
+#include <type_traits>
 
 
 #define LoggerInitializerImpl( lambdaInit ) \
diff --git a/include/implementation/LoggerUtils.h b/include/implementation/LoggerUtils.h
index b8d54ac..7e5d4fc 100644
--- a/include/implementation/LoggerUtils.h
+++ b/include/implementation/LoggerUtils.h
@@ -5,12 +5,12 @@
 #ifndef SIMPLE_CPP_LOGGER_LOGGERUTILS_H
 #define SIMPLE_CPP_LOGGER_LOGGERUTILS_H
 
-#include <iostream>
+#include <thread>
+#include <vector>
+#include <string>
 #include <fstream>
-#include "thread"
-#include "vector"
-#include "string"
-#include "functional"
+#include <iostream>
+#include <functional>
 
 
 #ifndef HAS_CPP_17
diff --git a/include/implementation/LoggerUtils.impl.h b/include/implementation/LoggerUtils.impl.h
index 04fe806..1e3b5d6 100644
--- a/include/implementation/LoggerUtils.impl.h
+++ b/include/implementation/LoggerUtils.impl.h
@@ -5,14 +5,14 @@
 #ifndef SIMPLE_CPP_LOGGER_LOGGERUTILS_IMPL_H
 #define SIMPLE_CPP_LOGGER_LOGGERUTILS_IMPL_H
 
-#include <iostream>
-#include <fstream>
+#include <cmath>
+#include <vector>
 #include <string>
-#include <algorithm>
 #include <memory>
 #include <cstring> // strrchr
-#include "cmath"
-#include "vector"
+#include <fstream>
+#include <iostream>
+#include <algorithm>
 
 #if defined(_WIN32)
 // Windows