clang-10 requires the use of 'override'
Discovered during gitlab auto-build for https://github.com/upx/upx/issues/595 modified: Makefile modified: p_armpe.h modified: p_djgpp2.h modified: p_lx_elf.h modified: p_lx_exc.h modified: p_lx_interp.h modified: p_lx_sh.h modified: p_mach.h modified: p_ps1.h modified: p_tmt.h modified: p_unix.h modified: p_vmlinx.h modified: p_vmlinz.h modified: p_w32pe.h modified: p_w64pep.h modified: pefile.h
This commit is contained in:
committed by
Markus F.X.J. Oberhumer
parent
2cfa4c1eb7
commit
ec33109b22
+15
-15
@@ -41,28 +41,28 @@ class PackW32Pe : public PeFile32
|
||||
public:
|
||||
PackW32Pe(InputFile *f);
|
||||
virtual ~PackW32Pe();
|
||||
virtual int getFormat() const { return UPX_F_WIN32_PE; }
|
||||
virtual const char *getName() const { return isrtm ? "rtm32/pe" : "win32/pe"; }
|
||||
virtual const char *getFullName(const options_t *) const { return "i386-win32.pe"; }
|
||||
virtual const int *getCompressionMethods(int method, int level) const;
|
||||
virtual const int *getFilters() const;
|
||||
virtual int getFormat() const override { return UPX_F_WIN32_PE; }
|
||||
virtual const char *getName() const override { return isrtm ? "rtm32/pe" : "win32/pe"; }
|
||||
virtual const char *getFullName(const options_t *) const override { return "i386-win32.pe"; }
|
||||
virtual const int *getCompressionMethods(int method, int level) const override;
|
||||
virtual const int *getFilters() const override;
|
||||
|
||||
virtual bool handleForceOption();
|
||||
virtual bool handleForceOption() override;
|
||||
virtual void defineSymbols(unsigned ncsection, unsigned upxsection,
|
||||
unsigned sizeof_oh, unsigned isize_isplit,
|
||||
unsigned s1addr);
|
||||
virtual void addNewRelocations(Reloc &, unsigned upxsection);
|
||||
virtual void setOhDataBase(const pe_section_t *osection);
|
||||
virtual void setOhHeaderSize(const pe_section_t *osection);
|
||||
virtual void pack(OutputFile *fo);
|
||||
unsigned s1addr) override;
|
||||
virtual void addNewRelocations(Reloc &, unsigned upxsection) override;
|
||||
virtual void setOhDataBase(const pe_section_t *osection) override;
|
||||
virtual void setOhHeaderSize(const pe_section_t *osection) override;
|
||||
virtual void pack(OutputFile *fo) override;
|
||||
|
||||
virtual bool canPack();
|
||||
virtual bool canPack() override;
|
||||
|
||||
protected:
|
||||
virtual int readFileHeader();
|
||||
virtual int readFileHeader() override;
|
||||
|
||||
virtual void buildLoader(const Filter *ft);
|
||||
virtual Linker* newLinker() const;
|
||||
virtual void buildLoader(const Filter *ft) override;
|
||||
virtual Linker* newLinker() const override;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user