summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
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 =
27 27
28/// Contains the characteristics of a particular event. 28/// Contains the characteristics of a particular event.
29struct EventType { 29struct EventType {
30 EventType(TimedCallback&& callback, std::string&& name) 30 explicit EventType(TimedCallback&& callback_, std::string&& name_)
31 : callback{std::move(callback)}, name{std::move(name)} {} 31 : callback{std::move(callback_)}, name{std::move(name_)} {}
32 32
33 /// The event's callback function. 33 /// The event's callback function.
34 TimedCallback callback; 34 TimedCallback callback;
@@ -67,8 +67,8 @@ public:
67 void Shutdown(); 67 void Shutdown();
68 68
69 /// Sets if emulation is multicore or single core, must be set before Initialize 69 /// Sets if emulation is multicore or single core, must be set before Initialize
70 void SetMulticore(bool is_multicore) { 70 void SetMulticore(bool is_multicore_) {
71 this->is_multicore = is_multicore; 71 is_multicore = is_multicore_;
72 } 72 }
73 73
74 /// Check if it's using host timing. 74 /// 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 {
119 BitField<0, 9, ErrorModule> module; 119 BitField<0, 9, ErrorModule> module;
120 BitField<9, 13, u32> description; 120 BitField<9, 13, u32> description;
121 121
122 constexpr explicit ResultCode(u32 raw) : raw(raw) {} 122 constexpr explicit ResultCode(u32 raw_) : raw(raw_) {}
123 123
124 constexpr ResultCode(ErrorModule module_, u32 description_) 124 constexpr ResultCode(ErrorModule module_, u32 description_)
125 : raw(module.FormatValue(module_) | description.FormatValue(description_)) {} 125 : raw(module.FormatValue(module_) | description.FormatValue(description_)) {}