Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Because make_optional exists it must not change #24

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Because make_optional exists it must not change #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/smd/optional/optional.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,19 +216,11 @@ using is_optional = is_optional_impl<std::decay_t<T>>;
template <typename T>
constexpr optional<std::decay_t<T>>
make_optional(T&& __t) noexcept(std::is_nothrow_constructible_v<optional<std::decay_t<T>>, T>)
requires std::is_constructible_v<std::decay_t<T>, T> && (!std::is_reference_v<T>)
requires std::is_constructible_v<std::decay_t<T>, T>
{
return optional<std::decay_t<T>>{std::forward<T>(__t)};
}

template <typename T>
constexpr optional<std::decay_t<T>&>
make_optional(T&& __t) noexcept(std::is_nothrow_constructible_v<optional<std::decay_t<T>>, T>)
requires std::is_constructible_v<std::decay_t<T>, T> && (std::is_reference_v<T>)
{
return optional<std::decay_t<T>&>{std::forward<T>(__t)};
}

template <typename T, typename... _Args>
constexpr optional<T> make_optional(_Args&&... __args) noexcept(std::is_nothrow_constructible_v<T, _Args...>)
requires std::is_constructible_v<T, _Args...>
Expand Down
4 changes: 2 additions & 2 deletions src/smd/optional/optional.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ TEST(OptionalTest, MakeOptional) {

auto i = 42;
auto o6 = smd::optional::make_optional<int&>(i);
static_assert(std::is_same<decltype(o6), smd::optional::optional<int&>>::value);
static_assert(std::is_same<decltype(o6), smd::optional::optional<int>>::value);

EXPECT_TRUE(
(std::is_same<decltype(o6), smd::optional::optional<int&>>::value));
(std::is_same<decltype(o6), smd::optional::optional<int>>::value));
EXPECT_TRUE(o6);
EXPECT_TRUE(*o6 == 42);
}
Expand Down
6 changes: 3 additions & 3 deletions src/smd/optional/optional_ref.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ TEST(OptionalRefTest, MakeOptional) {
auto o1 = smd::optional::make_optional<int&>(var);
auto o2 = smd::optional::optional<int&>(var);

constexpr bool is_same = std::is_same<decltype(o1), smd::optional::optional<int&>>::value;
constexpr bool is_same = std::is_same<decltype(o1), smd::optional::optional<int>>::value;
EXPECT_TRUE(is_same);
EXPECT_TRUE(o1 == o2);

Expand All @@ -396,9 +396,9 @@ TEST(OptionalRefTest, MakeOptional) {

auto i = 42;
auto o6 = smd::optional::make_optional<int&>(i);
static_assert(std::is_same<decltype(o6), smd::optional::optional<int&>>::value);
static_assert(std::is_same_v<decltype(o6), smd::optional::optional<int>>);

EXPECT_TRUE((std::is_same<decltype(o6), smd::optional::optional<int&>>::value));
EXPECT_TRUE((std::is_same_v<decltype(o6), smd::optional::optional<int>>));
EXPECT_TRUE(o6);
EXPECT_TRUE(*o6 == 42);
}
Expand Down
Loading