diff options
| author | 2021-09-08 14:36:20 -0400 | |
|---|---|---|
| committer | 2021-09-11 17:19:14 -0400 | |
| commit | 290afc00d36bbdcdc67d66a4586fd2f188734ad3 (patch) | |
| tree | d4f9a8eae42dd93ff1e7393ffea03b30faeab125 /src/core/network | |
| parent | Merge pull request #6846 from ameerj/nvdec-gpu-decode (diff) | |
| download | yuzu-290afc00d36bbdcdc67d66a4586fd2f188734ad3.tar.gz yuzu-290afc00d36bbdcdc67d66a4586fd2f188734ad3.tar.xz yuzu-290afc00d36bbdcdc67d66a4586fd2f188734ad3.zip | |
common: Move error handling to error.cpp/h
This allows us to avoid implicitly including <string> every time common_funcs.h is included.
Diffstat (limited to 'src/core/network')
| -rw-r--r-- | src/core/network/network.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ | |||
| 7 | #include <limits> | 7 | #include <limits> |
| 8 | #include <utility> | 8 | #include <utility> |
| 9 | #include <vector> | 9 | #include <vector> |
| 10 | #include "common/common_funcs.h" | 10 | |
| 11 | #include "common/error.h" | ||
| 11 | 12 | ||
| 12 | #ifdef _WIN32 | 13 | #ifdef _WIN32 |
| 13 | #include <winsock2.h> | 14 | #include <winsock2.h> |
| @@ -223,7 +224,7 @@ Errno GetAndLogLastError() { | |||
| 223 | if (err == Errno::AGAIN) { | 224 | if (err == Errno::AGAIN) { |
| 224 | return err; | 225 | return err; |
| 225 | } | 226 | } |
| 226 | LOG_ERROR(Network, "Socket operation error: {}", NativeErrorToString(e)); | 227 | LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e)); |
| 227 | return err; | 228 | return err; |
| 228 | } | 229 | } |
| 229 | 230 | ||