From 0fa406dbb71e75b798925df188d8d0b91ed0d606 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 11 May 2023 01:15:19 -0500 Subject: [PATCH] Remove unnecessary moves in return statements --- src/platform/linux/cuda.cpp | 2 +- src/platform/linux/cuda.cu | 2 +- src/platform/linux/graphics.cpp | 2 +- src/task_pool.h | 5 ++--- src/video.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/platform/linux/cuda.cpp b/src/platform/linux/cuda.cpp index 21ee6fa0..c2a2e0fd 100644 --- a/src/platform/linux/cuda.cpp +++ b/src/platform/linux/cuda.cpp @@ -350,7 +350,7 @@ namespace cuda { handle.handle_flags[SESSION_HANDLE] = true; - return std::move(handle); + return handle; } const char * diff --git a/src/platform/linux/cuda.cu b/src/platform/linux/cuda.cu index defd7ef3..107075d9 100644 --- a/src/platform/linux/cuda.cu +++ b/src/platform/linux/cuda.cu @@ -234,7 +234,7 @@ std::optional tex_t::make(int height, int pitch) { CU_CHECK_OPT(cudaCreateTextureObject(&tex.texture.linear, &res, &desc, nullptr), "Couldn't create cuda texture that uses linear interpolation"); - return std::move(tex); + return tex; } tex_t::tex_t() : array {}, texture { INVALID_TEXTURE } {} diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp index 96e4f34d..fcb7ab23 100644 --- a/src/platform/linux/graphics.cpp +++ b/src/platform/linux/graphics.cpp @@ -769,7 +769,7 @@ namespace egl { gl_drain_errors; - return std::move(sws); + return sws; } int diff --git a/src/task_pool.h b/src/task_pool.h index 918ff354..8da85ed0 100644 --- a/src/task_pool.h +++ b/src/task_pool.h @@ -222,14 +222,13 @@ namespace task_pool_util { if (!_tasks.empty()) { __task task = std::move(_tasks.front()); _tasks.pop_front(); - return std::move(task); + return task; } if (!_timer_tasks.empty() && std::get<0>(_timer_tasks.back()) <= std::chrono::steady_clock::now()) { __task task = std::move(std::get<1>(_timer_tasks.back())); _timer_tasks.pop_back(); - - return std::move(task); + return task; } return std::nullopt; diff --git a/src/video.cpp b/src/video.cpp index 677368a7..ac183b32 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -1498,7 +1498,7 @@ namespace video { encode_session.session = std::move(*session); - return std::move(encode_session); + return encode_session; } encode_e