jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

clang-10 requires the use of 'override'

Browse Source 
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:
John Reiser
2022-09-26 16:31:49 -07:00
committed by Markus F.X.J. Oberhumer
parent 2cfa4c1eb7
commit ec33109b22
12 changed files with 456 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_exc.h
+20 -20
View File
@@ -47,23 +47,23 @@ public:
void const *proto,
unsigned const brka
);
virtual int getFormat() const { return UPX_F_LINUX_i386; }
virtual const char *getName() const { return "linux.exec/i386"; }
virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.execve"; }
virtual const int *getCompressionMethods(int method, int level) const;
virtual const int *getFilters() const;
virtual void buildLoader(const Filter *);
virtual int getFormat() const override { return UPX_F_LINUX_i386; }
virtual const char *getName() const override { return "linux.exec/i386"; }
virtual const char *getFullName(const options_t *) const override { return "i386-linux.elf.execve"; }
virtual const int *getCompressionMethods(int method, int level) const override;
virtual const int *getFilters() const override;
virtual void buildLoader(const Filter *) override;
virtual bool canPack();
virtual bool canPack() override;
protected:
virtual void pack1(OutputFile *, Filter &); // generate executable header
// virtual void pack2(OutputFile *, Filter &); // append compressed data
// virtual void pack3(OutputFile *, Filter &); // append loader
virtual void pack4(OutputFile *, Filter &); // append PackHeader
virtual void pack1(OutputFile *, Filter &) override; // generate executable header
// virtual void pack2(OutputFile *, Filter &) override; // append compressed data
// virtual void pack3(OutputFile *, Filter &) override; // append loader
virtual void pack4(OutputFile *, Filter &) override; // append PackHeader
// loader util
virtual Linker* newLinker() const;
virtual Linker* newLinker() const override;
virtual int getLoaderPrefixSize() const;
virtual void buildLinuxLoader(
upx_byte const *const proto, // assembly-only sections
@@ -74,9 +74,9 @@ protected:
);
// patch util
virtual void patchLoader();
virtual void patchLoaderChecksum();
virtual void updateLoader(OutputFile *);
virtual void patchLoader() override;
virtual void patchLoaderChecksum() override;
virtual void updateLoader(OutputFile *) override;
// ELF util
virtual int checkEhdr(const Elf_LE32_Ehdr *ehdr) const;
@@ -134,14 +134,14 @@ class PackBSDI386 : public PackLinuxI386
typedef PackLinuxI386 super;
public:
PackBSDI386(InputFile *f);
virtual int getFormat() const { return UPX_F_BSD_i386; }
virtual const char *getName() const { return "bsd.exec/i386"; }
virtual const char *getFullName(const options_t *) const { return "i386-bsd.elf.execve"; }
virtual int getFormat() const override { return UPX_F_BSD_i386; }
virtual const char *getName() const override { return "bsd.exec/i386"; }
virtual const char *getFullName(const options_t *) const override { return "i386-bsd.elf.execve"; }
protected:
virtual void pack1(OutputFile *, Filter &); // generate executable header
virtual void pack1(OutputFile *, Filter &) override; // generate executable header
virtual void buildLoader(const Filter *);
virtual void buildLoader(const Filter *) override;
};
#endif /* already included */