summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/archive.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-10-27 21:23:16 -0400
committerGravatar bunnei2014-10-27 21:23:16 -0400
commit19d91a45f50b95e53369444b4a34758e58e96739 (patch)
tree04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/core/hle/kernel/archive.cpp
parentMerge pull request #154 from lioncash/dyncom (diff)
parentAdd `override` keyword through the code. (diff)
downloadyuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.gz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.xz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.zip
Merge pull request #153 from yuriks/add-override
Add override keyword where appropriate
Diffstat (limited to 'src/core/hle/kernel/archive.cpp')
-rw-r--r--src/core/hle/kernel/archive.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp
index 86aba7489..09b4e75a5 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/kernel/archive.cpp
@@ -42,11 +42,11 @@ enum class DirectoryCommand : u32 {
42 42
43class Archive : public Object { 43class Archive : public Object {
44public: 44public:
45 std::string GetTypeName() const { return "Archive"; } 45 std::string GetTypeName() const override { return "Archive"; }
46 std::string GetName() const { return name; } 46 std::string GetName() const override { return name; }
47 47
48 static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } 48 static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; }
49 Kernel::HandleType GetHandleType() const { return HandleType::Archive; } 49 Kernel::HandleType GetHandleType() const override { return HandleType::Archive; }
50 50
51 std::string name; ///< Name of archive (optional) 51 std::string name; ///< Name of archive (optional)
52 FileSys::Archive* backend; ///< Archive backend interface 52 FileSys::Archive* backend; ///< Archive backend interface
@@ -56,7 +56,7 @@ public:
56 * @param wait Boolean wait set if current thread should wait as a result of sync operation 56 * @param wait Boolean wait set if current thread should wait as a result of sync operation
57 * @return Result of operation, 0 on success, otherwise error code 57 * @return Result of operation, 0 on success, otherwise error code
58 */ 58 */
59 Result SyncRequest(bool* wait) { 59 Result SyncRequest(bool* wait) override {
60 u32* cmd_buff = Service::GetCommandBuffer(); 60 u32* cmd_buff = Service::GetCommandBuffer();
61 FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); 61 FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
62 62
@@ -119,7 +119,7 @@ public:
119 * @param wait Boolean wait set if current thread should wait as a result of sync operation 119 * @param wait Boolean wait set if current thread should wait as a result of sync operation
120 * @return Result of operation, 0 on success, otherwise error code 120 * @return Result of operation, 0 on success, otherwise error code
121 */ 121 */
122 Result WaitSynchronization(bool* wait) { 122 Result WaitSynchronization(bool* wait) override {
123 // TODO(bunnei): ImplementMe 123 // TODO(bunnei): ImplementMe
124 ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); 124 ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
125 return 0; 125 return 0;
@@ -128,11 +128,11 @@ public:
128 128
129class File : public Object { 129class File : public Object {
130public: 130public:
131 std::string GetTypeName() const { return "File"; } 131 std::string GetTypeName() const override { return "File"; }
132 std::string GetName() const { return path; } 132 std::string GetName() const override { return path; }
133 133
134 static Kernel::HandleType GetStaticHandleType() { return HandleType::File; } 134 static Kernel::HandleType GetStaticHandleType() { return HandleType::File; }
135 Kernel::HandleType GetHandleType() const { return HandleType::File; } 135 Kernel::HandleType GetHandleType() const override { return HandleType::File; }
136 136
137 std::string path; ///< Path of the file 137 std::string path; ///< Path of the file
138 std::unique_ptr<FileSys::File> backend; ///< File backend interface 138 std::unique_ptr<FileSys::File> backend; ///< File backend interface
@@ -142,7 +142,7 @@ public:
142 * @param wait Boolean wait set if current thread should wait as a result of sync operation 142 * @param wait Boolean wait set if current thread should wait as a result of sync operation
143 * @return Result of operation, 0 on success, otherwise error code 143 * @return Result of operation, 0 on success, otherwise error code
144 */ 144 */
145 Result SyncRequest(bool* wait) { 145 Result SyncRequest(bool* wait) override {
146 u32* cmd_buff = Service::GetCommandBuffer(); 146 u32* cmd_buff = Service::GetCommandBuffer();
147 FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]); 147 FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
148 switch (cmd) { 148 switch (cmd) {
@@ -211,7 +211,7 @@ public:
211 * @param wait Boolean wait set if current thread should wait as a result of sync operation 211 * @param wait Boolean wait set if current thread should wait as a result of sync operation
212 * @return Result of operation, 0 on success, otherwise error code 212 * @return Result of operation, 0 on success, otherwise error code
213 */ 213 */
214 Result WaitSynchronization(bool* wait) { 214 Result WaitSynchronization(bool* wait) override {
215 // TODO(bunnei): ImplementMe 215 // TODO(bunnei): ImplementMe
216 ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); 216 ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
217 return 0; 217 return 0;
@@ -220,11 +220,11 @@ public:
220 220
221class Directory : public Object { 221class Directory : public Object {
222public: 222public:
223 std::string GetTypeName() const { return "Directory"; } 223 std::string GetTypeName() const override { return "Directory"; }
224 std::string GetName() const { return path; } 224 std::string GetName() const override { return path; }
225 225
226 static Kernel::HandleType GetStaticHandleType() { return HandleType::Directory; } 226 static Kernel::HandleType GetStaticHandleType() { return HandleType::Directory; }
227 Kernel::HandleType GetHandleType() const { return HandleType::Directory; } 227 Kernel::HandleType GetHandleType() const override { return HandleType::Directory; }
228 228
229 std::string path; ///< Path of the directory 229 std::string path; ///< Path of the directory
230 std::unique_ptr<FileSys::Directory> backend; ///< File backend interface 230 std::unique_ptr<FileSys::Directory> backend; ///< File backend interface
@@ -234,7 +234,7 @@ public:
234 * @param wait Boolean wait set if current thread should wait as a result of sync operation 234 * @param wait Boolean wait set if current thread should wait as a result of sync operation
235 * @return Result of operation, 0 on success, otherwise error code 235 * @return Result of operation, 0 on success, otherwise error code
236 */ 236 */
237 Result SyncRequest(bool* wait) { 237 Result SyncRequest(bool* wait) override {
238 u32* cmd_buff = Service::GetCommandBuffer(); 238 u32* cmd_buff = Service::GetCommandBuffer();
239 DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]); 239 DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]);
240 switch (cmd) { 240 switch (cmd) {
@@ -274,7 +274,7 @@ public:
274 * @param wait Boolean wait set if current thread should wait as a result of sync operation 274 * @param wait Boolean wait set if current thread should wait as a result of sync operation
275 * @return Result of operation, 0 on success, otherwise error code 275 * @return Result of operation, 0 on success, otherwise error code
276 */ 276 */
277 Result WaitSynchronization(bool* wait) { 277 Result WaitSynchronization(bool* wait) override {
278 // TODO(bunnei): ImplementMe 278 // TODO(bunnei): ImplementMe
279 ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); 279 ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
280 return 0; 280 return 0;