Skip to content

No, unique address! #1363

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

Merged
CaseyCarter merged 1 commit into from
Oct 23, 2020
Merged

No, unique address! #1363

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
35 changes: 13 additions & 22 deletions stl/inc/algorithm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,11 @@ struct _Optimistic_temporary_buffer { // temporary storage with _alloca-like att

#ifdef __cpp_lib_concepts
namespace ranges {
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-attributes"
#endif // __clang__

// STRUCT TEMPLATE in_fun_result
template <class _In, class _Fun>
struct in_fun_result {
[[no_unique_address]] _In in;
[[no_unique_address]] _Fun fun;
/* [[no_unique_address]] */ _In in;
/* [[no_unique_address]] */ _Fun fun;

template <_Convertible_from<const _In&> _IIn, _Convertible_from<const _Fun&> _FFun>
constexpr operator in_fun_result<_IIn, _FFun>() const& {
Expand All @@ -119,8 +114,8 @@ namespace ranges {
// STRUCT TEMPLATE in_in_result
template <class _In1, class _In2>
struct in_in_result {
[[no_unique_address]] _In1 in1;
[[no_unique_address]] _In2 in2;
/* [[no_unique_address]] */ _In1 in1;
/* [[no_unique_address]] */ _In2 in2;

template <_Convertible_from<const _In1&> _IIn1, _Convertible_from<const _In2&> _IIn2>
constexpr operator in_in_result<_IIn1, _IIn2>() const& {
Expand All @@ -136,9 +131,9 @@ namespace ranges {
// STRUCT TEMPLATE in_in_out_result
template <class _In1, class _In2, class _Out>
struct in_in_out_result {
[[no_unique_address]] _In1 in1;
[[no_unique_address]] _In2 in2;
[[no_unique_address]] _Out out;
/* [[no_unique_address]] */ _In1 in1;
/* [[no_unique_address]] */ _In2 in2;
/* [[no_unique_address]] */ _Out out;

template <_Convertible_from<const _In1&> _IIn1, _Convertible_from<const _In2&> _IIn2,
_Convertible_from<const _Out&> _OOut>
Expand All @@ -155,9 +150,9 @@ namespace ranges {
// STRUCT TEMPLATE in_out_out_result
template <class _In, class _Out1, class _Out2>
struct in_out_out_result {
[[no_unique_address]] _In in;
[[no_unique_address]] _Out1 out1;
[[no_unique_address]] _Out2 out2;
/* [[no_unique_address]] */ _In in;
/* [[no_unique_address]] */ _Out1 out1;
/* [[no_unique_address]] */ _Out2 out2;

template <_Convertible_from<const _In&> _IIn, _Convertible_from<const _Out1&> _OOut1,
_Convertible_from<const _Out2&> _OOut2>
Expand All @@ -174,8 +169,8 @@ namespace ranges {
// STRUCT TEMPLATE min_max_result
template <class _Ty>
struct min_max_result {
[[no_unique_address]] _Ty min;
[[no_unique_address]] _Ty max;
/* [[no_unique_address]] */ _Ty min;
/* [[no_unique_address]] */ _Ty max;

template <_Convertible_from<const _Ty&> _Ty2>
constexpr operator min_max_result<_Ty2>() const& {
Expand All @@ -191,7 +186,7 @@ namespace ranges {
// STRUCT TEMPLATE in_found_result
template <class _In>
struct in_found_result {
[[no_unique_address]] _In in;
/* [[no_unique_address]] */ _In in;
bool found;

template <_Convertible_from<const _In&> _IIn>
Expand Down Expand Up @@ -291,10 +286,6 @@ namespace ranges {
return _RANGES next(_Mid, _Uend(_Range));
}
}

#ifdef __clang__
#pragma clang diagnostic pop
#endif // __clang__
} // namespace ranges
#endif // __cpp_lib_concepts

Expand Down
13 changes: 2 additions & 11 deletions stl/inc/xmemory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,16 +1447,11 @@ namespace ranges {
template <class _To, class _From>
concept _Convertible_from = convertible_to<_From, _To>;

#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-attributes"
#endif // __clang__

// STRUCT TEMPLATE in_out_result
template <class _In, class _Out>
struct in_out_result {
[[no_unique_address]] _In in;
[[no_unique_address]] _Out out;
/* [[no_unique_address]] */ _In in;
/* [[no_unique_address]] */ _Out out;

template <_Convertible_from<const _In&> _IIn, _Convertible_from<const _Out&> _OOut>
constexpr operator in_out_result<_IIn, _OOut>() const& {
Expand All @@ -1468,10 +1463,6 @@ namespace ranges {
return {_STD move(in), _STD move(out)};
}
};

#ifdef __clang__
#pragma clang diagnostic pop
#endif // __clang__
} // namespace ranges
#endif // __cpp_lib_concepts

Expand Down