Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-30 14:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build on CentOS 7

Browse source 
This fixes a regression in 9d303a74e (maybe_t: make maybe_t<T> trivially
copyable if T is, 2022-10-26). I subscribed to the launchpad repo now -.-
This commit is contained in:
Johannes Altmanninger 2022-10-27 09:26:52 +02:00
parent efa2cf0cb6
commit 0305c842e6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/maybe.h
View file

@ -147,10 +147,14 @@ inline constexpr none_t none() { return none_t::none; }
// This is a value-type class that stores a value of T in aligned storage. // This is a value-type class that stores a value of T in aligned storage.
template <typename T> template <typename T>
class maybe_t : private maybe_detail::conditionally_copyable_t<T> { class maybe_t : private maybe_detail::conditionally_copyable_t<T> {
#if __GNUG__ && __GNUC__ < 5
using maybe_impl_t = maybe_detail::maybe_impl_not_trivially_copyable_t<T>;
#else
using maybe_impl_t = using maybe_impl_t =
typename std::conditional<std::is_trivially_copyable<T>::value, typename std::conditional<std::is_trivially_copyable<T>::value,
maybe_detail::maybe_impl_trivially_copyable_t<T>, maybe_detail::maybe_impl_trivially_copyable_t<T>,
maybe_detail::maybe_impl_not_trivially_copyable_t<T>>::type; maybe_detail::maybe_impl_not_trivially_copyable_t<T> >::type;
#endif
maybe_impl_t impl_; maybe_impl_t impl_;
public: public: