Merge branch 'master' into master

include/assimp/importerdesc.h

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -49,9 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_IMPORTER_DESC_H_INC
 
 #ifdef __GNUC__
-#pragma GCC system_header
+#   pragma GCC system_header
 #endif
 
+#include <assimp/types.h>
+
 /** Mixed set of flags for #aiImporterDesc, indicating some features
   *  common to many importers*/
 enum aiImporterFlags {

test/unit/AssimpAPITest.cpp

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,14 +44,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 class AssimpAPITest : public ::testing::Test {
-
+    // empty
 };
 
 TEST_F( AssimpAPITest, aiGetImporterDescTest ) {
-    const aiImporterDesc *desc( NULL );
-    desc = aiGetImporterDesc( NULL );
-    EXPECT_EQ( NULL, desc );
+    const aiImporterDesc *desc( nullptr );
+    desc = aiGetImporterDesc(nullptr);
+    EXPECT_EQ(nullptr, desc);
 
     desc = aiGetImporterDesc( "obj" );
-    EXPECT_TRUE( NULL != desc );
+    EXPECT_TRUE(nullptr != desc);
+}
+
+TEST_F( AssimpAPITest, aiGetLastErrorTest ) {
+    const char *error = aiGetErrorString();
+    EXPECT_NE(nullptr, error);
 }