summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-10-31 04:23:10 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-25 03:30:26 +0100
commit2b1b0c2a30e242b08ec120e09803ec54d5445703 (patch)
tree9a10400a7e4403b288eee3aae8a52f1d5be912de /src/common
parentinput_common: Revert deleted TAS functions (diff)
downloadyuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.gz
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.bz2
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.lz
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.xz
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.zst
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/input.h4
-rw-r--r--src/common/settings.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/common/input.h b/src/common/input.h
index cb84f1005..6d3227f5e 100644
--- a/src/common/input.h
+++ b/src/common/input.h
@@ -12,7 +12,7 @@
#include "common/logging/log.h"
#include "common/param_package.h"
-namespace Input {
+namespace Common::Input {
enum class InputType {
None,
@@ -296,4 +296,4 @@ std::unique_ptr<InputDeviceType> CreateDevice(const Common::ParamPackage package
return pair->second->Create(package);
}
-} // namespace Input
+} // namespace Common::Input
diff --git a/src/common/settings.h b/src/common/settings.h
index dac44d000..95225fba7 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -6,7 +6,6 @@
#include <algorithm>
#include <array>
-#include <atomic>
#include <map>
#include <optional>
#include <string>