From 415302fdfaac2a78ea930559a3ce53ac0c09fd46 Mon Sep 17 00:00:00 2001 From: ephphatha Date: Thu, 9 Nov 2023 21:34:13 +1100 Subject: [PATCH] Go back to using int for missile frame comparison values The code that the gmock macros end up generating appears to obscure the type mismatch so there's no warning (in msvc on my system anyway) no matter what types are involved, for clarity the comparison ends up being between std::pair and testing::Pair>> --- test/missiles_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/missiles_test.cpp b/test/missiles_test.cpp index 1a56600f2..815ffb373 100644 --- a/test/missiles_test.cpp +++ b/test/missiles_test.cpp @@ -11,7 +11,7 @@ using ::testing::Lt; using ::testing::Pair; using ::testing::UnorderedElementsAre; -void TestArrowRotatesUniformly(Missile &missile, int startingFrame, unsigned leftFrame, unsigned rightFrame) +void TestArrowRotatesUniformly(Missile &missile, int startingFrame, int leftFrame, int rightFrame) { std::unordered_map observed {}; for (auto i = 0; i < 100; i++) {