From 290afc00d36bbdcdc67d66a4586fd2f188734ad3 Mon Sep 17 00:00:00 2001
From: Morph
Date: Wed, 8 Sep 2021 14:36:20 -0400
Subject: common: Move error handling to error.cpp/h

This allows us to avoid implicitly including <string> every time common_funcs.h is included.
---
 src/core/network/network.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/network/network.cpp b/src/core/network/network.cpp
index 4732d4485..72eea52f0 100644
--- a/src/core/network/network.cpp
+++ b/src/core/network/network.cpp
@@ -7,7 +7,8 @@
 #include <limits>
 #include <utility>
 #include <vector>
-#include "common/common_funcs.h"
+
+#include "common/error.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
@@ -223,7 +224,7 @@ Errno GetAndLogLastError() {
     if (err == Errno::AGAIN) {
         return err;
     }
-    LOG_ERROR(Network, "Socket operation error: {}", NativeErrorToString(e));
+    LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e));
     return err;
 }
 
-- 
cgit v1.2.3


From 4a6a73e887502b02c88de6eedf0ffa1f58de553d Mon Sep 17 00:00:00 2001
From: Morph
Date: Wed, 8 Sep 2021 15:13:21 -0400
Subject: file_sys/kernel_executable: Add missing <string> include

---
 src/core/file_sys/kernel_executable.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core')

diff --git a/src/core/file_sys/kernel_executable.h b/src/core/file_sys/kernel_executable.h
index 044c554d3..79ca82f8b 100644
--- a/src/core/file_sys/kernel_executable.h
+++ b/src/core/file_sys/kernel_executable.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <string>
 #include <vector>
 
 #include "common/common_funcs.h"
-- 
cgit v1.2.3


From 6f307f15218e41eb243e899427412e6dd38198a7 Mon Sep 17 00:00:00 2001
From: Morph
Date: Wed, 8 Sep 2021 20:04:29 -0400
Subject: kernel: Add missing <functional> include

---
 src/core/hle/kernel/kernel.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core')

diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 3a6db0b1c..901d43da9 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <functional>
 #include <memory>
 #include <string>
 #include <unordered_map>
-- 
cgit v1.2.3