diff options
author | scurest <scurest@users.noreply.github.com> | 2016-06-25 20:26:21 +0200 |
---|---|---|
committer | scurest <scurest@users.noreply.github.com> | 2016-06-25 20:26:21 +0200 |
commit | 0f9274fe2426e3b454d93f07e849243d51991cf8 (patch) | |
tree | 7fb68a81a0742e1beb59baeda3f60ffc3ef87f78 | |
parent | Merge pull request #1926 from JayFoxRox/gpl (diff) | |
download | yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.tar yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.tar.gz yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.tar.bz2 yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.tar.lz yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.tar.xz yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.tar.zst yuzu-0f9274fe2426e3b454d93f07e849243d51991cf8.zip |
-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, vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args); entry.message = std::string(formatting_buffer.data()); - return std::move(entry); + return entry; } 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() std::lock_guard<std::mutex> lock(pica_trace_mutex); 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) { |