diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-07-26 00:31:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 00:31:45 +0200 |
| commit | 1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2 (patch) | |
| tree | 999411f1ca76390654d1034c6d0bd2c47c3f101c /src/core/internal_network | |
| parent | Merge pull request #8564 from lat9nq/dinner-fork (diff) | |
| parent | network: Address review comments (diff) | |
| download | yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.gz yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.bz2 yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.lz yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.xz yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.zst yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/internal_network/network.cpp (renamed from src/core/network/network.cpp) | 6 | ||||
| -rw-r--r-- | src/core/internal_network/network.h (renamed from src/core/network/network.h) | 0 | ||||
| -rw-r--r-- | src/core/internal_network/network_interface.cpp (renamed from src/core/network/network_interface.cpp) | 2 | ||||
| -rw-r--r-- | src/core/internal_network/network_interface.h (renamed from src/core/network/network_interface.h) | 0 | ||||
| -rw-r--r-- | src/core/internal_network/sockets.h (renamed from src/core/network/sockets.h) | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/core/network/network.cpp b/src/core/internal_network/network.cpp index fdafbea92..36c43cc8f 100644 --- a/src/core/network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -29,9 +29,9 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "common/settings.h" -#include "core/network/network.h" -#include "core/network/network_interface.h" -#include "core/network/sockets.h" +#include "core/internal_network/network.h" +#include "core/internal_network/network_interface.h" +#include "core/internal_network/sockets.h" namespace Network { diff --git a/src/core/network/network.h b/src/core/internal_network/network.h index 10e5ef10d..10e5ef10d 100644 --- a/src/core/network/network.h +++ b/src/core/internal_network/network.h diff --git a/src/core/network/network_interface.cpp b/src/core/internal_network/network_interface.cpp index 15ecc6abf..0f0a66160 100644 --- a/src/core/network/network_interface.cpp +++ b/src/core/internal_network/network_interface.cpp @@ -11,7 +11,7 @@ #include "common/logging/log.h" #include "common/settings.h" #include "common/string_util.h" -#include "core/network/network_interface.h" +#include "core/internal_network/network_interface.h" #ifdef _WIN32 #include <iphlpapi.h> diff --git a/src/core/network/network_interface.h b/src/core/internal_network/network_interface.h index 9b98b6b42..9b98b6b42 100644 --- a/src/core/network/network_interface.h +++ b/src/core/internal_network/network_interface.h diff --git a/src/core/network/sockets.h b/src/core/internal_network/sockets.h index f889159f5..77e27e928 100644 --- a/src/core/network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -3,6 +3,7 @@ #pragma once +#include <map> #include <memory> #include <utility> @@ -12,7 +13,7 @@ #endif #include "common/common_types.h" -#include "core/network/network.h" +#include "core/internal_network/network.h" // TODO: C++20 Replace std::vector usages with std::span |