diff --git a/src/ripple/basics/Expected.h b/src/ripple/basics/Expected.h index 8dc368eefd7..bb699579b17 100644 --- a/src/ripple/basics/Expected.h +++ b/src/ripple/basics/Expected.h @@ -137,14 +137,14 @@ class [[nodiscard]] Expected public: template requires std::convertible_to constexpr Expected(U && r) - : Base(T{std::forward(r)}) + : Base(T(std::forward(r))) { } template requires std::convertible_to && (!std::is_reference_v)constexpr Expected(Unexpected e) - : Base(E{std::move(e.value())}) + : Base(E(std::move(e.value()))) { } @@ -220,7 +220,7 @@ class [[nodiscard]] Expected template requires std::convertible_to && (!std::is_reference_v)constexpr Expected(Unexpected e) - : Base(E{std::move(e.value())}) + : Base(E(std::move(e.value()))) { } diff --git a/src/test/basics/Expected_test.cpp b/src/test/basics/Expected_test.cpp index 1f16e724de6..b89b9f6d309 100644 --- a/src/test/basics/Expected_test.cpp +++ b/src/test/basics/Expected_test.cpp @@ -20,6 +20,9 @@ #include #include #include +#if BOOST_VERSION >= 107500 +#include // Not part of boost before version 1.75 +#endif // BOOST_VERSION #include #include @@ -203,6 +206,16 @@ struct Expected_test : beast::unit_test::suite std::string const s(std::move(expected.error())); BEAST_EXPECT(s == "Not what is expected!"); } + // Test a case that previously unintentionally returned an array. +#if BOOST_VERSION >= 107500 + { + auto expected = []() -> Expected { + return boost::json::object{{"oops", "me array now"}}; + }(); + BEAST_EXPECT(expected); + BEAST_EXPECT(!expected.value().is_array()); + } +#endif // BOOST_VERSION } };