diff --git a/code/AssetLib/OpenGEX/OpenGEXImporter.h b/code/AssetLib/OpenGEX/OpenGEXImporter.h index 2f669ff6e..70e62fd3e 100644 --- a/code/AssetLib/OpenGEX/OpenGEXImporter.h +++ b/code/AssetLib/OpenGEX/OpenGEXImporter.h @@ -102,10 +102,10 @@ protected: void InternReadFile( const std::string &file, aiScene *pScene, IOSystem *pIOHandler ) override; /// BaseImporter override. - virtual const aiImporterDesc *GetInfo() const override; + const aiImporterDesc *GetInfo() const override; /// BaseImporter override. - virtual void SetupProperties( const Importer *pImp ) override; + void SetupProperties( const Importer *pImp ) override; void handleNodes( ODDLParser::DDLNode *node, aiScene *pScene ); void handleMetricNode( ODDLParser::DDLNode *node, aiScene *pScene ); diff --git a/code/PostProcessing/EmbedTexturesProcess.h b/code/PostProcessing/EmbedTexturesProcess.h index b63ff0ba6..ed1c9408a 100644 --- a/code/PostProcessing/EmbedTexturesProcess.h +++ b/code/PostProcessing/EmbedTexturesProcess.h @@ -74,7 +74,7 @@ public: void SetupProperties(const Importer* pImp) override; /// Overwritten, @see BaseProcess - virtual void Execute(aiScene* pScene) override; + void Execute(aiScene* pScene) override; private: // Try several ways to attempt to resolve the image path diff --git a/code/PostProcessing/RemoveVCProcess.h b/code/PostProcessing/RemoveVCProcess.h index 349cdb17e..d552c7cc3 100644 --- a/code/PostProcessing/RemoveVCProcess.h +++ b/code/PostProcessing/RemoveVCProcess.h @@ -83,7 +83,7 @@ public: * The function is a request to the process to update its configuration * basing on the Importer's configuration property list. */ - virtual void SetupProperties(const Importer* pImp) override; + void SetupProperties(const Importer* pImp) override; // ------------------------------------------------------------------- /** Manually setup the configuration flags for the step diff --git a/code/PostProcessing/ScaleProcess.h b/code/PostProcessing/ScaleProcess.h index 0fc3cab63..ca3a18fe5 100644 --- a/code/PostProcessing/ScaleProcess.h +++ b/code/PostProcessing/ScaleProcess.h @@ -74,13 +74,13 @@ public: ai_real getScale() const; /// Overwritten, @see BaseProcess - virtual bool IsActive( unsigned int pFlags ) const override; + bool IsActive( unsigned int pFlags ) const override; /// Overwritten, @see BaseProcess - virtual void SetupProperties( const Importer* pImp ) override; + void SetupProperties( const Importer* pImp ) override; /// Overwritten, @see BaseProcess - virtual void Execute( aiScene* pScene ) override; + void Execute( aiScene* pScene ) override; private: void traverseNodes( aiNode *currentNode, unsigned int nested_node_id = 0 ); diff --git a/code/PostProcessing/SplitByBoneCountProcess.h b/code/PostProcessing/SplitByBoneCountProcess.h index fe2bcbd4a..c41e435a3 100644 --- a/code/PostProcessing/SplitByBoneCountProcess.h +++ b/code/PostProcessing/SplitByBoneCountProcess.h @@ -74,7 +74,7 @@ public: /// @brief Called prior to ExecuteOnScene(). /// The function is a request to the process to update its configuration /// basing on the Importer's configuration property list. - virtual void SetupProperties(const Importer* pImp) override; + void SetupProperties(const Importer* pImp) override; /// @brief Will return the maximal number of bones. /// @return The maximal number of bones. diff --git a/include/assimp/ZipArchiveIOSystem.h b/include/assimp/ZipArchiveIOSystem.h index 0c34b7d72..430e3203d 100644 --- a/include/assimp/ZipArchiveIOSystem.h +++ b/include/assimp/ZipArchiveIOSystem.h @@ -62,7 +62,7 @@ public: //! Open a Zip using the proffered IOSystem ZipArchiveIOSystem(IOSystem* pIOHandler, const char *pFilename, const char* pMode = "r"); ZipArchiveIOSystem(IOSystem* pIOHandler, const std::string& rFilename, const char* pMode = "r"); - virtual ~ZipArchiveIOSystem() override; + ~ZipArchiveIOSystem() override; bool Exists(const char* pFilename) const override; char getOsSeparator() const override; IOStream* Open(const char* pFilename, const char* pMode = "rb") override; diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp index 088147faf..ca482faa9 100644 --- a/test/unit/utImporter.cpp +++ b/test/unit/utImporter.cpp @@ -299,7 +299,7 @@ aiImporterDesc s_failingImporterDescription = { class FailingImporter : public Assimp::BaseImporter { public: virtual ~FailingImporter() = default; - virtual bool CanRead(const std::string &, Assimp::IOSystem *, bool) const override { + bool CanRead(const std::string &, Assimp::IOSystem *, bool) const override { return true; }