diff options
| author |  bunnei | 2021-03-08 13:51:37 -0800 |
|---|---|---|
| committer |  GitHub | 2021-03-08 13:51:37 -0800 |
| commit | 69ce5e41ebd266b2cd04cb609663eaca21c8ded9 (patch) | |
| tree | ed8f8429c89814266ac72db1fdf7591d03ab4c9a /src/common/fiber.h | |
| parent | Merge pull request #6047 from lioncash/dynarmic (diff) | |
| parent | common: Fiber: use a reference for YieldTo. (diff) | |
| download | yuzu-69ce5e41ebd266b2cd04cb609663eaca21c8ded9.tar.gz yuzu-69ce5e41ebd266b2cd04cb609663eaca21c8ded9.tar.xz yuzu-69ce5e41ebd266b2cd04cb609663eaca21c8ded9.zip | |
Merge pull request #6041 from bunnei/fiber-leaks
common: fiber: Use weak_ptr when yielding.
Diffstat (limited to 'src/common/fiber.h')
| -rw-r--r-- | src/common/fiber.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/fiber.h b/src/common/fiber.h index f7f587f8c..f2a8ff29a 100644 --- a/src/common/fiber.h +++ b/src/common/fiber.h | |||
| @@ -41,7 +41,7 @@ public: | |||
| 41 | 41 | ||
| 42 | /// Yields control from Fiber 'from' to Fiber 'to' | 42 | /// Yields control from Fiber 'from' to Fiber 'to' |
| 43 | /// Fiber 'from' must be the currently running fiber. | 43 | /// Fiber 'from' must be the currently running fiber. |
| 44 | static void YieldTo(std::shared_ptr<Fiber> from, std::shared_ptr<Fiber> to); | 44 | static void YieldTo(std::weak_ptr<Fiber> weak_from, Fiber& to); |
| 45 | [[nodiscard]] static std::shared_ptr<Fiber> ThreadToFiber(); | 45 | [[nodiscard]] static std::shared_ptr<Fiber> ThreadToFiber(); |
| 46 | 46 | ||
| 47 | void SetRewindPoint(std::function<void(void*)>&& rewind_func, void* rewind_param); | 47 | void SetRewindPoint(std::function<void(void*)>&& rewind_func, void* rewind_param); |