Merge branch 'master' into fbx_export_animation

test/unit/utMetadata.cpp

@@ -199,7 +199,7 @@ TEST_F( utMetadata, copy_test ) {
     m_data->Set( 6, "aiVector3D", vecVal );
 
     aiMetadata copy( *m_data );
-    EXPECT_EQ( 7, copy.mNumProperties );
+    EXPECT_EQ( 7u, copy.mNumProperties );
 
     // bool test
     {

test/unit/utPLYImportExport.cpp

@@ -132,10 +132,10 @@ TEST_F( utPLYImportExport, vertexColorTest ) {
     EXPECT_EQ(true, scene->mMeshes[0]->HasVertexColors(0));
 
     auto first_face = scene->mMeshes[0]->mFaces[0];
-    EXPECT_EQ(3, first_face.mNumIndices);
-    EXPECT_EQ(0, first_face.mIndices[0]);
-    EXPECT_EQ(1, first_face.mIndices[1]);
-    EXPECT_EQ(2, first_face.mIndices[2]);
+    EXPECT_EQ(3u, first_face.mNumIndices);
+    EXPECT_EQ(0u, first_face.mIndices[0]);
+    EXPECT_EQ(1u, first_face.mIndices[1]);
+    EXPECT_EQ(2u, first_face.mIndices[2]);
 }
 
 //Test issue #623, PLY importer should not automatically create faces