diff options
| author | 2021-07-25 15:31:33 -0400 | |
|---|---|---|
| committer | 2021-07-25 15:31:33 -0400 | |
| commit | 09d6cc99435322c5f480eaa2b0967e33f4966ba6 (patch) | |
| tree | 72cdf06f6b7d77fdf5826104fea691f3ea450f54 /src/tests/common/unique_function.cpp | |
| parent | configuration: Use combobox apply template where possible (diff) | |
| parent | Merge pull request #6575 from FernandoS27/new_settings (diff) | |
| download | yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.gz yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.xz yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.zip | |
Merge branch 'master' into fullscreen-enum
Diffstat (limited to 'src/tests/common/unique_function.cpp')
| -rw-r--r-- | src/tests/common/unique_function.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tests/common/unique_function.cpp b/src/tests/common/unique_function.cpp index ac9912738..aa6e86593 100644 --- a/src/tests/common/unique_function.cpp +++ b/src/tests/common/unique_function.cpp | |||
| @@ -17,10 +17,12 @@ struct Noisy { | |||
| 17 | Noisy& operator=(Noisy&& rhs) noexcept { | 17 | Noisy& operator=(Noisy&& rhs) noexcept { |
| 18 | state = "Move assigned"; | 18 | state = "Move assigned"; |
| 19 | rhs.state = "Moved away"; | 19 | rhs.state = "Moved away"; |
| 20 | return *this; | ||
| 20 | } | 21 | } |
| 21 | Noisy(const Noisy&) : state{"Copied constructed"} {} | 22 | Noisy(const Noisy&) : state{"Copied constructed"} {} |
| 22 | Noisy& operator=(const Noisy&) { | 23 | Noisy& operator=(const Noisy&) { |
| 23 | state = "Copied assigned"; | 24 | state = "Copied assigned"; |
| 25 | return *this; | ||
| 24 | } | 26 | } |
| 25 | 27 | ||
| 26 | std::string state; | 28 | std::string state; |