From 2d3d9eb6eb1462c7470390d9d15acb07ee32341e Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 30 Dec 2021 16:20:14 -0700 Subject: [PATCH] Reintroduce modernize-use-emplace check. (#540) --- .clang-tidy | 2 +- .../actuator/test_disk_uniform_ct.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 6c8984864a..065b8a26bc 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,5 +1,5 @@ --- -Checks: 'clang-diagnostic-*,clang-analyzer-*,corecppguidelines-*,modernize-*,readability-*,-readability-magic-numbers,-readability-identifier-naming,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-braces-around-statements,-readability-inconsistent-declaration-parameter-name,-modernize-use-emplace,-modernize-pass-by-value,-clang-analyzer-optin.cplusplus.VirtualCall,-clang-analyzer-core.NonNullParamChecker' +Checks: 'clang-diagnostic-*,clang-analyzer-*,corecppguidelines-*,modernize-*,readability-*,-readability-magic-numbers,-readability-identifier-naming,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-named-parameter,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-braces-around-statements,-readability-inconsistent-declaration-parameter-name,-modernize-pass-by-value,-clang-analyzer-optin.cplusplus.VirtualCall,-clang-analyzer-core.NonNullParamChecker' WarningsAsErrors: '' HeaderFilterRegex: '^((?!/amrex/Src/|/googletest/).)*$' AnalyzeTemporaryDtors: false diff --git a/unit_tests/wind_energy/actuator/test_disk_uniform_ct.cpp b/unit_tests/wind_energy/actuator/test_disk_uniform_ct.cpp index 7ae57f4a00..318ebf1563 100644 --- a/unit_tests/wind_energy/actuator/test_disk_uniform_ct.cpp +++ b/unit_tests/wind_energy/actuator/test_disk_uniform_ct.cpp @@ -210,10 +210,10 @@ TEST_F(UniformCtTest, yawed_normal_is_opposite_expected_wind_dir) const vs::Vector west = vs::Vector::ihat(); std::vector> couplets; - couplets.push_back(std::make_pair(north, 0.0)); - couplets.push_back(std::make_pair(south, 180.0)); - couplets.push_back(std::make_pair(west, 270.0)); - couplets.push_back(std::make_pair(east, 90.0)); + couplets.emplace_back(north, 0.0); + couplets.emplace_back(south, 180.0); + couplets.emplace_back(west, 270.0); + couplets.emplace_back(east, 90.0); amrex::ParmParse pp("Actuator.UniformCtDisk"); act::utils::ActParser ap("Actuator.UniformCtDisk", "Actuator"); @@ -239,10 +239,10 @@ TEST_F(UniformCtTest, sample_yawed_normal_is_opposite_expected_wind_dir) const vs::Vector west = vs::Vector::ihat(); std::vector> couplets; - couplets.push_back(std::make_pair(north, 0.0)); - couplets.push_back(std::make_pair(south, 180.0)); - couplets.push_back(std::make_pair(west, 270.0)); - couplets.push_back(std::make_pair(east, 90.0)); + couplets.emplace_back(north, 0.0); + couplets.emplace_back(south, 180.0); + couplets.emplace_back(west, 270.0); + couplets.emplace_back(east, 90.0); amrex::ParmParse pp("Actuator.UniformCtDisk"); act::utils::ActParser ap("Actuator.UniformCtDisk", "Actuator");