@@ -686,14 +686,13 @@ union _LIBCPP_TEMPLATE_VIS __union<_DestructibleTrait, _Index> {};
686
686
_LIBCPP_HIDE_FROM_ABI explicit constexpr __union (in_place_index_t <_Ip>, _Args&&... __args) \
687
687
: __tail (in_place_index<_Ip - 1 >, std::forward<_Args>(__args)...) {} \
688
688
\
689
- _LIBCPP_HIDE_FROM_ABI __union (const __union&) = default ; \
690
- _LIBCPP_HIDE_FROM_ABI __union (__union&&) = default ; \
691
- destructor; \
689
+ _LIBCPP_HIDE_FROM_ABI __union (const __union&) = default ; \
690
+ _LIBCPP_HIDE_FROM_ABI __union (__union&&) = default ; \
692
691
_LIBCPP_HIDE_FROM_ABI __union& operator =(const __union&) = default ; \
693
692
_LIBCPP_HIDE_FROM_ABI __union& operator =(__union&&) = default ; \
693
+ destructor \
694
694
\
695
- private: \
696
- char __dummy; \
695
+ private : char __dummy; \
697
696
__alt<_Index, _Tp> __head; \
698
697
__union<destructible_trait, _Index + 1 , _Types...> __tail; \
699
698
\
@@ -756,14 +755,13 @@ class _LIBCPP_TEMPLATE_VIS __dtor;
756
755
public: \
757
756
using __base_type::__base_type; \
758
757
using __base_type::operator =; \
759
- _LIBCPP_HIDE_FROM_ABI __dtor (const __dtor&) = default; \
760
- _LIBCPP_HIDE_FROM_ABI __dtor (__dtor&&) = default; \
761
- destructor; \
758
+ _LIBCPP_HIDE_FROM_ABI __dtor (const __dtor&) = default; \
759
+ _LIBCPP_HIDE_FROM_ABI __dtor (__dtor&&) = default; \
762
760
_LIBCPP_HIDE_FROM_ABI __dtor& operator =(const __dtor&) = default ; \
763
761
_LIBCPP_HIDE_FROM_ABI __dtor& operator =(__dtor&&) = default ; \
762
+ destructor \
764
763
\
765
- protected: \
766
- destroy \
764
+ protected : destroy \
767
765
}
768
766
769
767
_LIBCPP_VARIANT_DESTRUCTOR (
@@ -832,11 +830,11 @@ class _LIBCPP_TEMPLATE_VIS __move_constructor;
832
830
using __base_type::__base_type; \
833
831
using __base_type::operator =; \
834
832
\
835
- _LIBCPP_HIDE_FROM_ABI __move_constructor (const __move_constructor&) = default; \
836
- move_constructor; \
833
+ _LIBCPP_HIDE_FROM_ABI __move_constructor (const __move_constructor&) = default; \
837
834
_LIBCPP_HIDE_FROM_ABI ~__move_constructor () = default ; \
838
835
_LIBCPP_HIDE_FROM_ABI __move_constructor& operator =(const __move_constructor&) = default ; \
839
836
_LIBCPP_HIDE_FROM_ABI __move_constructor& operator =(__move_constructor&&) = default ; \
837
+ move_constructor \
840
838
}
841
839
842
840
_LIBCPP_VARIANT_MOVE_CONSTRUCTOR (
@@ -868,11 +866,11 @@ class _LIBCPP_TEMPLATE_VIS __copy_constructor;
868
866
using __base_type::__base_type; \
869
867
using __base_type::operator =; \
870
868
\
871
- copy_constructor; \
872
869
_LIBCPP_HIDE_FROM_ABI __copy_constructor (__copy_constructor&&) = default; \
873
870
_LIBCPP_HIDE_FROM_ABI ~__copy_constructor () = default ; \
874
871
_LIBCPP_HIDE_FROM_ABI __copy_constructor& operator =(const __copy_constructor&) = default ; \
875
872
_LIBCPP_HIDE_FROM_ABI __copy_constructor& operator =(__copy_constructor&&) = default ; \
873
+ copy_constructor \
876
874
}
877
875
878
876
_LIBCPP_VARIANT_COPY_CONSTRUCTOR (_Trait::_TriviallyAvailable,
@@ -996,11 +994,11 @@ class _LIBCPP_TEMPLATE_VIS __copy_assignment;
996
994
using __base_type::__base_type; \
997
995
using __base_type::operator =; \
998
996
\
999
- _LIBCPP_HIDE_FROM_ABI __copy_assignment (const __copy_assignment&) = default; \
1000
- _LIBCPP_HIDE_FROM_ABI __copy_assignment (__copy_assignment&&) = default; \
1001
- _LIBCPP_HIDE_FROM_ABI ~__copy_assignment () = default ; \
1002
- copy_assignment; \
997
+ _LIBCPP_HIDE_FROM_ABI __copy_assignment (const __copy_assignment&) = default; \
998
+ _LIBCPP_HIDE_FROM_ABI __copy_assignment (__copy_assignment&&) = default; \
999
+ _LIBCPP_HIDE_FROM_ABI ~__copy_assignment () = default ; \
1003
1000
_LIBCPP_HIDE_FROM_ABI __copy_assignment& operator =(__copy_assignment&&) = default ; \
1001
+ copy_assignment \
1004
1002
}
1005
1003
1006
1004
_LIBCPP_VARIANT_COPY_ASSIGNMENT (_Trait::_TriviallyAvailable,
0 commit comments