From 6a035b88d731d879ff957ea36c2771f4e276062d Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Tue, 10 Jan 2023 09:35:58 -0800 Subject: [PATCH] Two more tbb compile issues --- gtsam/hybrid/tests/TinyHybridExample.h | 2 +- gtsam/linear/tests/testErrors.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtsam/hybrid/tests/TinyHybridExample.h b/gtsam/hybrid/tests/TinyHybridExample.h index c34d55bf0..ad1374911 100644 --- a/gtsam/hybrid/tests/TinyHybridExample.h +++ b/gtsam/hybrid/tests/TinyHybridExample.h @@ -57,7 +57,7 @@ inline HybridBayesNet createHybridBayesNet(int num_measurements = 1, // Add prior on mode. const size_t nrModes = manyModes ? num_measurements : 1; - for (int i = 0; i < nrModes; i++) { + for (const size_t i = 0; i < nrModes; i++) { bayesNet.emplace_back(new DiscreteConditional({M(i), 2}, "4/6")); } return bayesNet; diff --git a/gtsam/linear/tests/testErrors.cpp b/gtsam/linear/tests/testErrors.cpp index 415cd9496..2075dc5bc 100644 --- a/gtsam/linear/tests/testErrors.cpp +++ b/gtsam/linear/tests/testErrors.cpp @@ -24,12 +24,11 @@ using namespace gtsam; /* ************************************************************************* */ TEST(Errors, arithmetic) { - Errors e = std::list{Vector2(1.0, 2.0), Vector3(3.0, 4.0, 5.0)}; + Errors e = {Vector2(1.0, 2.0), Vector3(3.0, 4.0, 5.0)}; DOUBLES_EQUAL(1 + 4 + 9 + 16 + 25, dot(e, e), 1e-9); axpy(2.0, e, e); - const Errors expected = - std::list{Vector2(3.0, 6.0), Vector3(9.0, 12.0, 15.0)}; + const Errors expected = {Vector2(3.0, 6.0), Vector3(9.0, 12.0, 15.0)}; CHECK(assert_equal(expected, e)); }