diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-09-12 18:01:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 18:01:23 +0200 |
| commit | 74030eb4277c179c62189a978b693e081bfe7c4c (patch) | |
| tree | e2f4ba2fa65f8b9bdfbd86352a65539f46d9193f /src/core | |
| parent | Merge pull request #6986 from Morph1984/version-update (diff) | |
| parent | shader_environment: Add missing <algorithm> include (diff) | |
| download | yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.gz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.bz2 yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.lz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.xz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.zst yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/kernel_executable.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 1 | ||||
| -rw-r--r-- | src/core/network/network.cpp | 5 |
3 files changed, 5 insertions, 2 deletions
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" 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> 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; } |