Browse Source

Use case which matches surrounding code.

Malcolm Tyrrell 5 years ago
parent
commit
6f9c61e157
2 changed files with 4 additions and 4 deletions
  1. 2 2
      code/Common/BaseImporter.cpp
  2. 2 2
      include/assimp/BaseImporter.h

+ 2 - 2
code/Common/BaseImporter.cpp

@@ -134,12 +134,12 @@ aiScene *BaseImporter::ReadFile(Importer *pImp, const std::string &pFile, IOSyst
         // extract error description
         // extract error description
         m_ErrorText = err.what();
         m_ErrorText = err.what();
         ASSIMP_LOG_ERROR(m_ErrorText.c_str());
         ASSIMP_LOG_ERROR(m_ErrorText.c_str());
-        m_exception = std::current_exception();
+        m_Exception = std::current_exception();
         return nullptr;
         return nullptr;
     } catch( const std::exception& err )    {
     } catch( const std::exception& err )    {
         m_ErrorText = "Internal error";
         m_ErrorText = "Internal error";
         ASSIMP_LOG_ERROR(err.what());
         ASSIMP_LOG_ERROR(err.what());
-        m_exception = std::current_exception();
+        m_Exception = std::current_exception();
         return nullptr;
         return nullptr;
     }
     }
 
 

+ 2 - 2
include/assimp/BaseImporter.h

@@ -155,7 +155,7 @@ public:
      * @return The last exception that occurred. 
      * @return The last exception that occurred. 
      */
      */
     const std::exception_ptr& GetException() const {
     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"
     /// In case of other errors, this will just be "Internal error"
     std::string m_ErrorText;
     std::string m_ErrorText;
     /// An exception which occurred.
     /// An exception which occurred.
-    std::exception_ptr m_exception;
+    std::exception_ptr m_Exception;
     /// Currently set progress handler.
     /// Currently set progress handler.
     ProgressHandler *m_progress;
     ProgressHandler *m_progress;
 };
 };