7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-23 03:15:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fully fix result impl

Browse source
This commit is contained in:
altalk23 2022-12-03 14:35:28 +03:00
parent 9838f51f07
commit 67d26ac6a7
2 changed files with 6 additions and 6 deletions
loader
include/Geode/utils
Result.hpp
src/utils
cocos.cpp

8
loader/include/Geode/utils/Result.hpp
View file

@ -33,7 +33,7 @@ namespace geode {
template <class E2>
requires(std::is_constructible_v<E, E2 &&>)
explicit constexpr Failure(E2&& e) : m_error(std::forward<E>(e)) {}
explicit constexpr Failure(E2&& e) : m_error(std::move(e)) {}
E& error() & noexcept {
return m_error;
@ -65,7 +65,7 @@ namespace geode {
template <class T2>
requires(std::is_constructible_v<T, T2 &&>)
explicit constexpr Success(T2&& v) : m_value(std::forward<T>(v)) {}
explicit constexpr Success(T2&& v) : m_value(std::forward<T2>(v)) {}
T& value() & noexcept {
return m_value;
@ -104,7 +104,7 @@ namespace geode {
template <class E2>
requires(std::is_constructible_v<E, E2 &&>)
constexpr Result(impl::Failure<E2>&& e) : Base(cpp::failure<E>(e.error())) {}
constexpr Result(impl::Failure<E2>&& e) : Base(cpp::failure<E>(std::move(e.error()))) {}
template <class T2>
requires(std::is_constructible_v<T, T2 const&>)
@ -112,7 +112,7 @@ namespace geode {
template <class T2>
requires(std::is_constructible_v<T, T2 &&>)
constexpr Result(impl::Success<T2>&& s) : Base(s.value()) {}
constexpr Result(impl::Success<T2>&& s) : Base(std::move(s.value())) {}
[[nodiscard]] constexpr explicit operator bool() const noexcept {
return this->operator bool();

4
loader/src/utils/cocos.cpp
View file

@ -1,5 +1,5 @@
#include <Geode/utils/cocos.hpp>
#include <Geode/modify/LoadingLayer.hpp>
#include <Geode/utils/cocos.hpp>
USE_GEODE_NAMESPACE();
@ -346,7 +346,7 @@ void geode::cocos::reloadTextures(CreateLayerFunc returnTo) {
GameManager::get()->reloadAll(false, false, true);
}
class $modify(LoadingLayer) {
struct LoadingFinished : Modify<LoadingFinished, LoadingLayer> {
void loadAssets() {
// loadFinished is inlined on Macchew OS :sob: