summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-11-25 21:21:03 +0100
committerLioncash <mathew1800@gmail.com>2020-12-03 06:54:31 +0100
commit1ea6bdef058a789e2771511f741bffcca73c3525 (patch)
tree6bcfaa3649add0bb73ff5bbcf982197439c896d1 /src/core
parentMerge pull request #4959 from Morph1984/emulated-controller-styleset (diff)
downloadyuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.gz
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.bz2
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.lz
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.xz
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.zst
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core_timing.h8
-rw-r--r--src/core/hle/result.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index b0b6036e4..77ff4c6fe 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -27,8 +27,8 @@ using TimedCallback =
/// Contains the characteristics of a particular event.
struct EventType {
- EventType(TimedCallback&& callback, std::string&& name)
- : callback{std::move(callback)}, name{std::move(name)} {}
+ explicit EventType(TimedCallback&& callback_, std::string&& name_)
+ : callback{std::move(callback_)}, name{std::move(name_)} {}
/// The event's callback function.
TimedCallback callback;
@@ -67,8 +67,8 @@ public:
void Shutdown();
/// Sets if emulation is multicore or single core, must be set before Initialize
- void SetMulticore(bool is_multicore) {
- this->is_multicore = is_multicore;
+ void SetMulticore(bool is_multicore_) {
+ is_multicore = is_multicore_;
}
/// Check if it's using host timing.
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index b6bdbd988..8feda7ad7 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -119,7 +119,7 @@ union ResultCode {
BitField<0, 9, ErrorModule> module;
BitField<9, 13, u32> description;
- constexpr explicit ResultCode(u32 raw) : raw(raw) {}
+ constexpr explicit ResultCode(u32 raw_) : raw(raw_) {}
constexpr ResultCode(ErrorModule module_, u32 description_)
: raw(module.FormatValue(module_) | description.FormatValue(description_)) {}