Fix warning related to inconsistent-missing-destructor-override.

Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
pull/5049/head
Jackie9527 2023-04-01 21:34:36 +08:00
parent 7c64b6c599
commit 7df4efea44
10 changed files with 16 additions and 17 deletions

View File

@ -68,7 +68,7 @@ using namespace D3DS;
class Discreet3DSImporter : public BaseImporter { class Discreet3DSImporter : public BaseImporter {
public: public:
Discreet3DSImporter(); Discreet3DSImporter();
~Discreet3DSImporter(); ~Discreet3DSImporter() override;
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Returns whether the class can handle the format of the given file. /** Returns whether the class can handle the format of the given file.

View File

@ -93,7 +93,7 @@ public:
// empty // empty
} }
~EmbeddedTexture() = default; ~EmbeddedTexture() override = default;
ResourceType getType() const override { ResourceType getType() const override {
return ResourceType::RT_EmbeddedTexture2D; return ResourceType::RT_EmbeddedTexture2D;
@ -110,7 +110,7 @@ public:
// empty // empty
} }
~Texture2DGroup() = default; ~Texture2DGroup() override = default;
ResourceType getType() const override { ResourceType getType() const override {
return ResourceType::RT_Texture2DGroup; return ResourceType::RT_Texture2DGroup;
@ -127,7 +127,7 @@ public:
// empty // empty
} }
~BaseMaterials() = default; ~BaseMaterials() override = default;
ResourceType getType() const override { ResourceType getType() const override {
return ResourceType::RT_BaseMaterials; return ResourceType::RT_BaseMaterials;
@ -152,7 +152,7 @@ public:
// empty // empty
} }
~Object() = default; ~Object() override = default;
ResourceType getType() const override { ResourceType getType() const override {
return ResourceType::RT_Object; return ResourceType::RT_Object;

View File

@ -58,7 +58,7 @@ namespace Assimp {
class RAWImporter : public BaseImporter { class RAWImporter : public BaseImporter {
public: public:
RAWImporter(); RAWImporter();
~RAWImporter(); ~RAWImporter() override;
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Returns whether the class can handle the format of the given file. /** Returns whether the class can handle the format of the given file.

View File

@ -56,7 +56,7 @@ namespace Assimp {
class UnrealImporter : public BaseImporter { class UnrealImporter : public BaseImporter {
public: public:
UnrealImporter(); UnrealImporter();
~UnrealImporter(); ~UnrealImporter() override;
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** @brief Returns whether we can handle the format of the given file /** @brief Returns whether we can handle the format of the given file

View File

@ -483,7 +483,7 @@ private:
public: public:
Buffer(); Buffer();
~Buffer(); ~Buffer() override;
void Read(Value &obj, Asset &r); void Read(Value &obj, Asset &r);

View File

@ -1211,7 +1211,6 @@ IF (ASSIMP_WARNINGS_AS_ERRORS)
-Wno-undef -Wno-undef
-Wno-suggest-destructor-override -Wno-suggest-destructor-override
-Wno-suggest-override -Wno-suggest-override
-Wno-inconsistent-missing-destructor-override
-Wno-zero-as-null-pointer-constant -Wno-zero-as-null-pointer-constant
-Wno-global-constructors -Wno-global-constructors
-Wno-exit-time-destructors -Wno-exit-time-destructors

View File

@ -68,7 +68,7 @@ class ZipFile : public IOStream {
public: public:
std::string m_Filename; std::string m_Filename;
virtual ~ZipFile(); virtual ~ZipFile() override;
// IOStream interface // IOStream interface
size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override; size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override;

View File

@ -84,7 +84,7 @@ protected:
public: public:
/** Destructor public to allow simple deletion to close the file. */ /** Destructor public to allow simple deletion to close the file. */
~DefaultIOStream (); ~DefaultIOStream () override;
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/// Read from stream /// Read from stream

View File

@ -65,8 +65,8 @@ namespace Assimp {
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
class MemoryIOStream : public IOStream { class MemoryIOStream : public IOStream {
public: public:
MemoryIOStream (const uint8_t* buff, size_t len, bool own = false) : MemoryIOStream (const uint8_t* buff, size_t len, bool own = false) :
buffer (buff), buffer (buff),
length(len), length(len),
pos(static_cast<size_t>(0)), pos(static_cast<size_t>(0)),
own(own) { own(own) {
@ -145,7 +145,7 @@ public:
} }
/// @brief Destructor. /// @brief Destructor.
~MemoryIOSystem() = default; ~MemoryIOSystem() override = default;
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/// @brief Tests for the existence of a file at the given path. /// @brief Tests for the existence of a file at the given path.
@ -190,7 +190,7 @@ public:
bool ComparePaths(const char* one, const char* second) const override { bool ComparePaths(const char* one, const char* second) const override {
return existing_io ? existing_io->ComparePaths(one, second) : false; return existing_io ? existing_io->ComparePaths(one, second) : false;
} }
/// @brief Will push the directory. /// @brief Will push the directory.
bool PushDirectory( const std::string &path ) override { bool PushDirectory( const std::string &path ) override {
return existing_io ? existing_io->PushDirectory(path) : false; return existing_io ? existing_io->PushDirectory(path) : false;
@ -216,7 +216,7 @@ public:
bool CreateDirectory( const std::string &path ) override { bool CreateDirectory( const std::string &path ) override {
return existing_io ? existing_io->CreateDirectory(path) : false; return existing_io ? existing_io->CreateDirectory(path) : false;
} }
/// @brief Will change the directory. /// @brief Will change the directory.
bool ChangeDirectory( const std::string &path ) override { bool ChangeDirectory( const std::string &path ) override {
return existing_io ? existing_io->ChangeDirectory(path) : false; return existing_io ? existing_io->ChangeDirectory(path) : false;

View File

@ -63,7 +63,7 @@ public:
//! Open a Zip using the proffered IOSystem //! Open a Zip using the proffered IOSystem
ZipArchiveIOSystem(IOSystem* pIOHandler, const char *pFilename, const char* pMode = "r"); ZipArchiveIOSystem(IOSystem* pIOHandler, const char *pFilename, const char* pMode = "r");
ZipArchiveIOSystem(IOSystem* pIOHandler, const std::string& rFilename, const char* pMode = "r"); ZipArchiveIOSystem(IOSystem* pIOHandler, const std::string& rFilename, const char* pMode = "r");
virtual ~ZipArchiveIOSystem(); virtual ~ZipArchiveIOSystem() override;
bool Exists(const char* pFilename) const override; bool Exists(const char* pFilename) const override;
char getOsSeparator() const override; char getOsSeparator() const override;
IOStream* Open(const char* pFilename, const char* pMode = "rb") override; IOStream* Open(const char* pFilename, const char* pMode = "rb") override;