github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-28 04:03:39 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix the Xenial build

Browse Source 
The Xenial build was failing due to a missing default constructor
in maybe_t. Add it.
This commit is contained in:
ridiculousfish 2022-10-26 14:19:01 -07:00
parent 06d9708d40
commit a4aaa4f59b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/maybe.h
View File

@ -85,6 +85,7 @@ struct maybe_impl_not_trivially_copyable_t : public maybe_impl_trivially_copyabl
new (storage) T(std::move(v.value())); new (storage) T(std::move(v.value()));
} }
} }
maybe_impl_not_trivially_copyable_t &operator=(maybe_impl_not_trivially_copyable_t &&v) { maybe_impl_not_trivially_copyable_t &operator=(maybe_impl_not_trivially_copyable_t &&v) {
if (!v.filled) { if (!v.filled) {
reset(); reset();
@ -101,6 +102,7 @@ struct maybe_impl_not_trivially_copyable_t : public maybe_impl_trivially_copyabl
new (storage) T(v.value()); new (storage) T(v.value());
} }
} }
maybe_impl_not_trivially_copyable_t &operator=(const maybe_impl_not_trivially_copyable_t &v) { maybe_impl_not_trivially_copyable_t &operator=(const maybe_impl_not_trivially_copyable_t &v) {
if (&v == this) return *this; if (&v == this) return *this;
if (!v.filled) { if (!v.filled) {
@ -111,6 +113,7 @@ struct maybe_impl_not_trivially_copyable_t : public maybe_impl_trivially_copyabl
return *this; return *this;
} }
maybe_impl_not_trivially_copyable_t() = default;
~maybe_impl_not_trivially_copyable_t() { reset(); } ~maybe_impl_not_trivially_copyable_t() { reset(); }
}; };