Просмотр исходного кода

Merge pull request #1930 from scurest/superfluous-moves

Remove superfluous std::move in return std::move(local_var)
Yuri Kunde Schlesner 10 лет назад
Родитель
Сommit
9cde5cbbd3
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      src/common/logging/backend.cpp
  2. 1 1
      src/video_core/debug_utils/debug_utils.cpp

+ 1 - 1
src/common/logging/backend.cpp

@@ -117,7 +117,7 @@ Entry CreateEntry(Class log_class, Level log_level,
     vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args);
     vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args);
     entry.message = std::string(formatting_buffer.data());
     entry.message = std::string(formatting_buffer.data());
 
 
-    return std::move(entry);
+    return entry;
 }
 }
 
 
 static Filter* filter = nullptr;
 static Filter* filter = nullptr;

+ 1 - 1
src/video_core/debug_utils/debug_utils.cpp

@@ -328,7 +328,7 @@ std::unique_ptr<PicaTrace> FinishPicaTracing()
     std::lock_guard<std::mutex> lock(pica_trace_mutex);
     std::lock_guard<std::mutex> lock(pica_trace_mutex);
     std::unique_ptr<PicaTrace> ret(std::move(pica_trace));
     std::unique_ptr<PicaTrace> ret(std::move(pica_trace));
 
 
-    return std::move(ret);
+    return ret;
 }
 }
 
 
 const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info, bool disable_alpha) {
 const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info, bool disable_alpha) {