diff options
| author | 2016-06-25 12:56:26 -0700 | |
|---|---|---|
| committer | 2016-06-25 12:56:26 -0700 | |
| commit | 9cde5cbbd39d612601df85d8792eea48c96bdc3e (patch) | |
| tree | 7fb68a81a0742e1beb59baeda3f60ffc3ef87f78 /src | |
| parent | Merge pull request #1926 from JayFoxRox/gpl (diff) | |
| parent | Remove superfluous std::move in return std::move(local_var) (diff) | |
| download | yuzu-9cde5cbbd39d612601df85d8792eea48c96bdc3e.tar.gz yuzu-9cde5cbbd39d612601df85d8792eea48c96bdc3e.tar.xz yuzu-9cde5cbbd39d612601df85d8792eea48c96bdc3e.zip | |
Merge pull request #1930 from scurest/superfluous-moves
Remove superfluous std::move in return std::move(local_var)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/logging/backend.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index d7008fc66..0b2fabec9 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -117,7 +117,7 @@ Entry CreateEntry(Class log_class, Level log_level, | |||
| 117 | vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args); | 117 | vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args); |
| 118 | entry.message = std::string(formatting_buffer.data()); | 118 | entry.message = std::string(formatting_buffer.data()); |
| 119 | 119 | ||
| 120 | return std::move(entry); | 120 | return entry; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | static Filter* filter = nullptr; | 123 | static Filter* filter = nullptr; |
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 871368323..bfa686380 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -328,7 +328,7 @@ std::unique_ptr<PicaTrace> FinishPicaTracing() | |||
| 328 | std::lock_guard<std::mutex> lock(pica_trace_mutex); | 328 | std::lock_guard<std::mutex> lock(pica_trace_mutex); |
| 329 | std::unique_ptr<PicaTrace> ret(std::move(pica_trace)); | 329 | std::unique_ptr<PicaTrace> ret(std::move(pica_trace)); |
| 330 | 330 | ||
| 331 | return std::move(ret); | 331 | return ret; |
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info, bool disable_alpha) { | 334 | const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info, bool disable_alpha) { |