diff options
| author | 2018-01-17 20:21:14 -0500 | |
|---|---|---|
| committer | 2018-01-17 20:21:16 -0500 | |
| commit | 3d19102c48adb397ae4c86ced7c2345eea1c28ee (patch) | |
| tree | 81743be0f586655bc142ec61a93376e8bcce456d /src | |
| parent | vi: Add missing override specifiers (diff) | |
| download | yuzu-3d19102c48adb397ae4c86ced7c2345eea1c28ee.tar.gz yuzu-3d19102c48adb397ae4c86ced7c2345eea1c28ee.tar.xz yuzu-3d19102c48adb397ae4c86ced7c2345eea1c28ee.zip | |
vi: Make constructors explicit where applicable
Prevents implicit conversions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/vi/vi.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index dac681605..02aab6df1 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp | |||
| @@ -26,7 +26,7 @@ public: | |||
| 26 | // This default size was chosen arbitrarily. | 26 | // This default size was chosen arbitrarily. |
| 27 | static constexpr size_t DefaultBufferSize = 0x40; | 27 | static constexpr size_t DefaultBufferSize = 0x40; |
| 28 | Parcel() : buffer(DefaultBufferSize) {} | 28 | Parcel() : buffer(DefaultBufferSize) {} |
| 29 | Parcel(std::vector<u8> data) : buffer(std::move(data)) {} | 29 | explicit Parcel(std::vector<u8> data) : buffer(std::move(data)) {} |
| 30 | virtual ~Parcel() = default; | 30 | virtual ~Parcel() = default; |
| 31 | 31 | ||
| 32 | template <typename T> | 32 | template <typename T> |
| @@ -121,7 +121,7 @@ private: | |||
| 121 | 121 | ||
| 122 | class NativeWindow : public Parcel { | 122 | class NativeWindow : public Parcel { |
| 123 | public: | 123 | public: |
| 124 | NativeWindow(u32 id) : Parcel() { | 124 | explicit NativeWindow(u32 id) : Parcel() { |
| 125 | data.id = id; | 125 | data.id = id; |
| 126 | } | 126 | } |
| 127 | ~NativeWindow() override = default; | 127 | ~NativeWindow() override = default; |
| @@ -147,7 +147,7 @@ private: | |||
| 147 | 147 | ||
| 148 | class IGBPConnectRequestParcel : public Parcel { | 148 | class IGBPConnectRequestParcel : public Parcel { |
| 149 | public: | 149 | public: |
| 150 | IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { | 150 | explicit IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { |
| 151 | Deserialize(); | 151 | Deserialize(); |
| 152 | } | 152 | } |
| 153 | ~IGBPConnectRequestParcel() override = default; | 153 | ~IGBPConnectRequestParcel() override = default; |
| @@ -168,7 +168,7 @@ public: | |||
| 168 | 168 | ||
| 169 | class IGBPConnectResponseParcel : public Parcel { | 169 | class IGBPConnectResponseParcel : public Parcel { |
| 170 | public: | 170 | public: |
| 171 | IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() { | 171 | explicit IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() { |
| 172 | data.width = width; | 172 | data.width = width; |
| 173 | data.height = height; | 173 | data.height = height; |
| 174 | } | 174 | } |
| @@ -194,7 +194,8 @@ private: | |||
| 194 | 194 | ||
| 195 | class IGBPSetPreallocatedBufferRequestParcel : public Parcel { | 195 | class IGBPSetPreallocatedBufferRequestParcel : public Parcel { |
| 196 | public: | 196 | public: |
| 197 | IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { | 197 | explicit IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer) |
| 198 | : Parcel(buffer) { | ||
| 198 | Deserialize(); | 199 | Deserialize(); |
| 199 | } | 200 | } |
| 200 | ~IGBPSetPreallocatedBufferRequestParcel() override = default; | 201 | ~IGBPSetPreallocatedBufferRequestParcel() override = default; |
| @@ -231,7 +232,7 @@ protected: | |||
| 231 | 232 | ||
| 232 | class IGBPDequeueBufferRequestParcel : public Parcel { | 233 | class IGBPDequeueBufferRequestParcel : public Parcel { |
| 233 | public: | 234 | public: |
| 234 | IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { | 235 | explicit IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { |
| 235 | Deserialize(); | 236 | Deserialize(); |
| 236 | } | 237 | } |
| 237 | ~IGBPDequeueBufferRequestParcel() override = default; | 238 | ~IGBPDequeueBufferRequestParcel() override = default; |
| @@ -254,7 +255,7 @@ public: | |||
| 254 | 255 | ||
| 255 | class IGBPDequeueBufferResponseParcel : public Parcel { | 256 | class IGBPDequeueBufferResponseParcel : public Parcel { |
| 256 | public: | 257 | public: |
| 257 | IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {} | 258 | explicit IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {} |
| 258 | ~IGBPDequeueBufferResponseParcel() override = default; | 259 | ~IGBPDequeueBufferResponseParcel() override = default; |
| 259 | 260 | ||
| 260 | protected: | 261 | protected: |
| @@ -271,7 +272,7 @@ protected: | |||
| 271 | 272 | ||
| 272 | class IGBPRequestBufferRequestParcel : public Parcel { | 273 | class IGBPRequestBufferRequestParcel : public Parcel { |
| 273 | public: | 274 | public: |
| 274 | IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { | 275 | explicit IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { |
| 275 | Deserialize(); | 276 | Deserialize(); |
| 276 | } | 277 | } |
| 277 | ~IGBPRequestBufferRequestParcel() override = default; | 278 | ~IGBPRequestBufferRequestParcel() override = default; |
| @@ -286,7 +287,7 @@ public: | |||
| 286 | 287 | ||
| 287 | class IGBPRequestBufferResponseParcel : public Parcel { | 288 | class IGBPRequestBufferResponseParcel : public Parcel { |
| 288 | public: | 289 | public: |
| 289 | IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {} | 290 | explicit IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {} |
| 290 | ~IGBPRequestBufferResponseParcel() override = default; | 291 | ~IGBPRequestBufferResponseParcel() override = default; |
| 291 | 292 | ||
| 292 | protected: | 293 | protected: |
| @@ -307,7 +308,7 @@ protected: | |||
| 307 | 308 | ||
| 308 | class IGBPQueueBufferRequestParcel : public Parcel { | 309 | class IGBPQueueBufferRequestParcel : public Parcel { |
| 309 | public: | 310 | public: |
| 310 | IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { | 311 | explicit IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { |
| 311 | Deserialize(); | 312 | Deserialize(); |
| 312 | } | 313 | } |
| 313 | ~IGBPQueueBufferRequestParcel() override = default; | 314 | ~IGBPQueueBufferRequestParcel() override = default; |
| @@ -330,7 +331,7 @@ public: | |||
| 330 | 331 | ||
| 331 | class IGBPQueueBufferResponseParcel : public Parcel { | 332 | class IGBPQueueBufferResponseParcel : public Parcel { |
| 332 | public: | 333 | public: |
| 333 | IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() { | 334 | explicit IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() { |
| 334 | data.width = width; | 335 | data.width = width; |
| 335 | data.height = height; | 336 | data.height = height; |
| 336 | } | 337 | } |
| @@ -356,7 +357,7 @@ private: | |||
| 356 | 357 | ||
| 357 | class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> { | 358 | class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> { |
| 358 | public: | 359 | public: |
| 359 | IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger) | 360 | explicit IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger) |
| 360 | : ServiceFramework("IHOSBinderDriver"), nv_flinger(std::move(nv_flinger)) { | 361 | : ServiceFramework("IHOSBinderDriver"), nv_flinger(std::move(nv_flinger)) { |
| 361 | static const FunctionInfo functions[] = { | 362 | static const FunctionInfo functions[] = { |
| 362 | {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"}, | 363 | {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"}, |
| @@ -506,7 +507,7 @@ private: | |||
| 506 | 507 | ||
| 507 | class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> { | 508 | class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> { |
| 508 | public: | 509 | public: |
| 509 | IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger) | 510 | explicit IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger) |
| 510 | : ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) { | 511 | : ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) { |
| 511 | static const FunctionInfo functions[] = { | 512 | static const FunctionInfo functions[] = { |
| 512 | {1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"}, | 513 | {1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"}, |