@@ -281,7 +281,9 @@ struct is_nothrow_swappable
281
281
282
282
// std::void_t from C++17
283
283
template <class ...>
284
- struct voider { using type = void ; };
284
+ struct voider {
285
+ using type = void ;
286
+ };
285
287
template <class ... Ts>
286
288
using void_t = typename voider<Ts...>::type;
287
289
@@ -514,7 +516,7 @@ struct optional_copy_assign_base<T, false> : optional_move_base<T> {
514
516
// to make do with a non-trivial move assignment operator even if T is trivially
515
517
// move assignable
516
518
#ifndef TL_OPTIONAL_GCC49
517
- template <class T , bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value&& std::is_trivially_move_assignable<T>::value>
519
+ template <class T , bool = std::is_trivially_destructible<T>::value && std::is_trivially_move_constructible<T>::value && std::is_trivially_move_assignable<T>::value>
518
520
struct optional_move_assign_base : optional_copy_assign_base<T> {
519
521
using optional_copy_assign_base<T>::optional_copy_assign_base;
520
522
};
@@ -537,7 +539,7 @@ struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
537
539
538
540
optional_move_assign_base&
539
541
operator =(optional_move_assign_base&& rhs) noexcept (
540
- std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
542
+ std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value) {
541
543
this ->assign (std::move (rhs));
542
544
return *this ;
543
545
}
@@ -1241,7 +1243,7 @@ class optional : private detail::optional_move_assign_base<T>,
1241
1243
// / If one has a value, it is moved to the other and the movee is left
1242
1244
// / valueless.
1243
1245
void
1244
- swap (optional& rhs) noexcept (std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
1246
+ swap (optional& rhs) noexcept (std::is_nothrow_move_constructible<T>::value && detail::is_nothrow_swappable<T>::value) {
1245
1247
using std::swap;
1246
1248
if (has_value ()) {
1247
1249
if (rhs.has_value ()) {
0 commit comments