From c86dcbe1a83fbae733f11bd5eb4ff42c97cfdda7 Mon Sep 17 00:00:00 2001 From: contriteobserver Date: Sat, 30 Jan 2021 16:49:32 -0800 Subject: [PATCH] cleaned up sign-compare unittest build warnings addresses issue #3624 --- test/unit/Common/utStandardShapes.cpp | 2 +- test/unit/utFBXImporterExporter.cpp | 4 ++-- test/unit/utFindDegenerates.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/unit/Common/utStandardShapes.cpp b/test/unit/Common/utStandardShapes.cpp index 8469fecd6..eaaed098f 100644 --- a/test/unit/Common/utStandardShapes.cpp +++ b/test/unit/Common/utStandardShapes.cpp @@ -46,7 +46,7 @@ TEST_F( utStandardShapes, testMakeMesh ) { Assimp::StandardShapes::MakeSphere(1, positions); // Make mesh - const auto numIndicesPerPrimitive = 3; + const auto numIndicesPerPrimitive = 3u; aiMesh *aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive); // The mNumIndices member of the second face is now incorrect diff --git a/test/unit/utFBXImporterExporter.cpp b/test/unit/utFBXImporterExporter.cpp index 332bfc1ec..a0b8bafe5 100644 --- a/test/unit/utFBXImporterExporter.cpp +++ b/test/unit/utFBXImporterExporter.cpp @@ -324,7 +324,7 @@ TEST_F(utFBXImporterExporter, importMaxPbrMaterialsMetalRoughness) { ASSERT_NE(nullptr, scene); ASSERT_TRUE(scene->mRootNode); - ASSERT_EQ(scene->mNumMaterials, 1); + ASSERT_EQ(scene->mNumMaterials, 1u); const aiMaterial* mat = scene->mMaterials[0]; aiString texture; ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS); @@ -377,7 +377,7 @@ TEST_F(utFBXImporterExporter, importMaxPbrMaterialsSpecularGloss) { ASSERT_NE(nullptr, scene); ASSERT_TRUE(scene->mRootNode); - ASSERT_EQ(scene->mNumMaterials, 1); + ASSERT_EQ(scene->mNumMaterials, 1u); const aiMaterial* mat = scene->mMaterials[0]; aiString texture; ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS); diff --git a/test/unit/utFindDegenerates.cpp b/test/unit/utFindDegenerates.cpp index 280a5199d..dfd68d11e 100644 --- a/test/unit/utFindDegenerates.cpp +++ b/test/unit/utFindDegenerates.cpp @@ -201,8 +201,8 @@ TEST_F(FindDegeneratesProcessTest, meshRemoval) { mProcess->Execute(scene.get()); - EXPECT_EQ(scene->mNumMeshes, 1); + EXPECT_EQ(scene->mNumMeshes, 1u); EXPECT_EQ(scene->mMeshes[0], meshWhichSurvives); - EXPECT_EQ(scene->mRootNode->mNumMeshes, 1); - EXPECT_EQ(scene->mRootNode->mMeshes[0], 0); + EXPECT_EQ(scene->mRootNode->mNumMeshes, 1u); + EXPECT_EQ(scene->mRootNode->mMeshes[0], 0u); }