Browse Source

Merge pull request #1856 from mesilliac/unit_test_gcc_warnings_fix

Address some gcc warnings about signed / unsigned comparison.
Kim Kulling 7 years ago
parent
commit
359f54f6ca
2 changed files with 5 additions and 5 deletions
  1. 1 1
      test/unit/utMetadata.cpp
  2. 4 4
      test/unit/utPLYImportExport.cpp

+ 1 - 1
test/unit/utMetadata.cpp

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

+ 4 - 4
test/unit/utPLYImportExport.cpp

@@ -132,10 +132,10 @@ TEST_F( utPLYImportExport, vertexColorTest ) {
     EXPECT_EQ(true, scene->mMeshes[0]->HasVertexColors(0));
     EXPECT_EQ(true, scene->mMeshes[0]->HasVertexColors(0));
 
 
     auto first_face = scene->mMeshes[0]->mFaces[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
 //Test issue #623, PLY importer should not automatically create faces