Merge pull request #4023 from zhaowenlan1779/port-yuzu-797

Port yuzu-emu/yuzu#797 from yuzu
This commit is contained in:
Merry 2018-07-30 08:28:35 +01:00 committed by GitHub
commit f4a389dca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -222,7 +222,7 @@ protected:
* @param max_sessions Maximum number of sessions that can be * @param max_sessions Maximum number of sessions that can be
* connected to this service at the same time. * connected to this service at the same time.
*/ */
ServiceFramework(const char* service_name, u32 max_sessions = DefaultMaxSessions) explicit ServiceFramework(const char* service_name, u32 max_sessions = DefaultMaxSessions)
: ServiceFrameworkBase(service_name, max_sessions, Invoker) {} : ServiceFrameworkBase(service_name, max_sessions, Invoker) {}
/// Registers handlers in the service. /// Registers handlers in the service.

View file

@ -189,7 +189,7 @@ private:
u32 entryPoint; u32 entryPoint;
public: public:
ElfReader(void* ptr); explicit ElfReader(void* ptr);
u32 Read32(int off) const { u32 Read32(int off) const {
return base32[off >> 2]; return base32[off >> 2];

View file

@ -84,7 +84,7 @@ constexpr u32 MakeMagic(char a, char b, char c, char d) {
/// Interface for loading an application /// Interface for loading an application
class AppLoader : NonCopyable { class AppLoader : NonCopyable {
public: public:
AppLoader(FileUtil::IOFile&& file) : file(std::move(file)) {} explicit AppLoader(FileUtil::IOFile&& file) : file(std::move(file)) {}
virtual ~AppLoader() {} virtual ~AppLoader() {}
/** /**

View file

@ -32,7 +32,7 @@ public:
* Recorder constructor * Recorder constructor
* @param initial_state Initial recorder state * @param initial_state Initial recorder state
*/ */
Recorder(const InitialState& initial_state); explicit Recorder(const InitialState& initial_state);
/// Finish recording of this Citrace and save it using the given filename. /// Finish recording of this Citrace and save it using the given filename.
void Finish(const std::string& filename); void Finish(const std::string& filename);