diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp index 1b8f9927a..6f5e744a0 100644 --- a/code/Common/BaseImporter.cpp +++ b/code/Common/BaseImporter.cpp @@ -134,12 +134,12 @@ aiScene *BaseImporter::ReadFile(Importer *pImp, const std::string &pFile, IOSyst // extract error description m_ErrorText = err.what(); ASSIMP_LOG_ERROR(m_ErrorText.c_str()); - m_exception = std::current_exception(); + m_Exception = std::current_exception(); return nullptr; } catch( const std::exception& err ) { m_ErrorText = "Internal error"; ASSIMP_LOG_ERROR(err.what()); - m_exception = std::current_exception(); + m_Exception = std::current_exception(); return nullptr; } diff --git a/include/assimp/BaseImporter.h b/include/assimp/BaseImporter.h index 114531385..3aaa80f69 100644 --- a/include/assimp/BaseImporter.h +++ b/include/assimp/BaseImporter.h @@ -155,7 +155,7 @@ public: * @return The last exception that occurred. */ const std::exception_ptr& GetException() const { - return m_exception; + return m_Exception; } // ------------------------------------------------------------------- @@ -423,7 +423,7 @@ protected: /// In case of other errors, this will just be "Internal error" std::string m_ErrorText; /// An exception which occurred. - std::exception_ptr m_exception; + std::exception_ptr m_Exception; /// Currently set progress handler. ProgressHandler *m_progress; };