summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2018-07-23 23:10:48 -0400
committerGravatar Lioncash2018-07-23 23:13:22 -0400
commit1d755abce43534aae22f1c8402c8476e2f1f8fec (patch)
tree7f83ccf765241740286ba49b6ed045070924b527 /src
parentMerge pull request #790 from bunnei/shader-print-instr (diff)
downloadyuzu-1d755abce43534aae22f1c8402c8476e2f1f8fec.tar.gz
yuzu-1d755abce43534aae22f1c8402c8476e2f1f8fec.tar.xz
yuzu-1d755abce43534aae22f1c8402c8476e2f1f8fec.zip
core: Make converting constructors explicit where applicable
Avoids unwanted implicit conversions. Thankfully, given the large amount of cleanup in past PRs, only this tiny amount is left over to cover.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/acc/acc.cpp2
-rw-r--r--src/core/hle/service/service.h2
-rw-r--r--src/core/loader/elf.cpp2
-rw-r--r--src/core/loader/loader.h2
-rw-r--r--src/core/tracer/recorder.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 3e1c2c0a0..0b158e015 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -35,7 +35,7 @@ static constexpr u128 DEFAULT_USER_ID{1ull, 0ull};
35 35
36class IProfile final : public ServiceFramework<IProfile> { 36class IProfile final : public ServiceFramework<IProfile> {
37public: 37public:
38 IProfile(u128 user_id) : ServiceFramework("IProfile"), user_id(user_id) { 38 explicit IProfile(u128 user_id) : ServiceFramework("IProfile"), user_id(user_id) {
39 static const FunctionInfo functions[] = { 39 static const FunctionInfo functions[] = {
40 {0, nullptr, "Get"}, 40 {0, nullptr, "Get"},
41 {1, &IProfile::GetBase, "GetBase"}, 41 {1, &IProfile::GetBase, "GetBase"},
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index fee841d46..180f22703 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -146,7 +146,7 @@ protected:
146 * @param max_sessions Maximum number of sessions that can be 146 * @param max_sessions Maximum number of sessions that can be
147 * connected to this service at the same time. 147 * connected to this service at the same time.
148 */ 148 */
149 ServiceFramework(const char* service_name, u32 max_sessions = DefaultMaxSessions) 149 explicit ServiceFramework(const char* service_name, u32 max_sessions = DefaultMaxSessions)
150 : ServiceFrameworkBase(service_name, max_sessions, Invoker) {} 150 : ServiceFrameworkBase(service_name, max_sessions, Invoker) {}
151 151
152 /// Registers handlers in the service. 152 /// Registers handlers in the service.
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 4bfd5f536..352938dcb 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -190,7 +190,7 @@ private:
190 u32 entryPoint; 190 u32 entryPoint;
191 191
192public: 192public:
193 ElfReader(void* ptr); 193 explicit ElfReader(void* ptr);
194 194
195 u32 Read32(int off) const { 195 u32 Read32(int off) const {
196 return base32[off >> 2]; 196 return base32[off >> 2];
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 6f517ca8c..fbf11e5d0 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -79,7 +79,7 @@ enum class ResultStatus {
79/// Interface for loading an application 79/// Interface for loading an application
80class AppLoader : NonCopyable { 80class AppLoader : NonCopyable {
81public: 81public:
82 AppLoader(FileSys::VirtualFile file) : file(std::move(file)) {} 82 explicit AppLoader(FileSys::VirtualFile file) : file(std::move(file)) {}
83 virtual ~AppLoader() {} 83 virtual ~AppLoader() {}
84 84
85 /** 85 /**
diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h
index 629c2f6d2..e1cefd5fe 100644
--- a/src/core/tracer/recorder.h
+++ b/src/core/tracer/recorder.h
@@ -32,7 +32,7 @@ public:
32 * Recorder constructor 32 * Recorder constructor
33 * @param initial_state Initial recorder state 33 * @param initial_state Initial recorder state
34 */ 34 */
35 Recorder(const InitialState& initial_state); 35 explicit Recorder(const InitialState& initial_state);
36 36
37 /// Finish recording of this Citrace and save it using the given filename. 37 /// Finish recording of this Citrace and save it using the given filename.
38 void Finish(const std::string& filename); 38 void Finish(const std::string& filename);