Import Cobalt 21.master.0.299983
Includes the following patches:
https://cobalt-review.googlesource.com/c/cobalt/+/6030
n1214.hwang@samsung.com
diff --git a/src/starboard/elf_loader/file_impl.h b/src/starboard/elf_loader/file_impl.h
index 8545195..ebd1c92 100644
--- a/src/starboard/elf_loader/file_impl.h
+++ b/src/starboard/elf_loader/file_impl.h
@@ -15,8 +15,6 @@
#ifndef STARBOARD_ELF_LOADER_FILE_IMPL_H_
#define STARBOARD_ELF_LOADER_FILE_IMPL_H_
-#include "starboard/elf_loader/elf.h"
-
#include "starboard/elf_loader/file.h"
#include "starboard/file.h"
@@ -28,11 +26,11 @@
public:
FileImpl();
~FileImpl() override;
- bool Open(const char* name);
- bool ReadFromOffset(int64_t offset, char* buffer, int size);
- void Close();
+ bool Open(const char* name) override;
+ bool ReadFromOffset(int64_t offset, char* buffer, int size) override;
+ void Close() override;
- private:
+ protected:
SbFile file_;
FileImpl(const FileImpl&) = delete;