From 13144a08e496b89b34093ffd3d810d3442df3c44 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Thu, 14 May 2020 23:15:35 +0100 Subject: Enable some more clang-tidy linter checks (#4738) * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate --- src/World.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index 43cb4bf3e..251c8ce51 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -1206,11 +1206,8 @@ void cWorld::TickQueuedTasks(void) // Partition everything to be executed by returning false to move to end of list if time reached auto MoveBeginIterator = std::partition(m_Tasks.begin(), m_Tasks.end(), [this](const decltype(m_Tasks)::value_type & a_Task) { - if (a_Task.first < std::chrono::duration_cast(m_WorldAge).count()) - { - return false; - } - return true; + const auto WorldAgeTicks = std::chrono::duration_cast(m_WorldAge).count(); + return (a_Task.first >= WorldAgeTicks); } ); @@ -3061,7 +3058,7 @@ void cWorld::QueueSaveAllChunks(void) void cWorld::QueueTask(std::function a_Task) { cCSLock Lock(m_CSTasks); - m_Tasks.emplace_back(0, a_Task); + m_Tasks.emplace_back(0, std::move(a_Task)); } @@ -3075,7 +3072,7 @@ void cWorld::ScheduleTask(int a_DelayTicks, std::function a_Tas // Insert the task into the list of scheduled tasks { cCSLock Lock(m_CSTasks); - m_Tasks.emplace_back(TargetTick, a_Task); + m_Tasks.emplace_back(TargetTick, std::move(a_Task)); } } -- cgit v1.2.3