Skip to content

Cleanups: Friendship is magic #3524

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
Stephan T. Lavavej (StephanTLavavej) merged 4 commits into from
Mar 7, 2023
Merged

Cleanups: Friendship is magic #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42e58b5
Friendship: Use bitset's injected-class-name.
StephanTLavavej Feb 27, 2023
7d6f16e
Friendship: Consistently grant access to the parent meow_view.
StephanTLavavej Feb 27, 2023
38696cd
Drop unnecessary forward declaration of `_Locimp`.
StephanTLavavej Feb 27, 2023
ab5ea73
Friendship: Use forward declarations and extended friends instead of …
StephanTLavavej Mar 3, 2023
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
2 changes: 1 addition & 1 deletion stl/inc/bitset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public:
#pragma warning(pop)

class reference { // proxy for an element
friend bitset<_Bits>;
friend bitset;

public:
_CONSTEXPR23 reference(const reference&) = default;
Expand Down
4 changes: 3 additions & 1 deletion stl/inc/exception
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ protected:
}
};

class bad_array_new_length;

class bad_alloc : public exception { // base of all bad allocation exceptions
public:
__CLR_OR_THIS_CALL bad_alloc() noexcept
Expand All @@ -143,7 +145,7 @@ public:
__CLR_OR_THIS_CALL ~bad_alloc() noexcept override {}

private:
friend class bad_array_new_length;
friend bad_array_new_length;

__CLR_OR_THIS_CALL bad_alloc(const char* _Message) noexcept
: exception(_Message, 1) {} // construct from message string with no memory allocation
Expand Down
7 changes: 5 additions & 2 deletions stl/inc/filesystem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,9 @@ namespace filesystem {
using file_time_type = _CHRONO time_point<filesystem::_File_time_clock>;
#endif // ^^^ !_HAS_CXX20

struct _Dir_enum_impl;
struct _Recursive_dir_enum_impl;

_EXPORT_STD class directory_entry {
public:
// [fs.dir.entry.cons], constructors and destructor
Expand Down Expand Up @@ -2473,8 +2476,8 @@ namespace filesystem {
return _Error;
}

friend struct _Dir_enum_impl;
friend struct _Recursive_dir_enum_impl;
friend _Dir_enum_impl;
friend _Recursive_dir_enum_impl;
friend void _Copy_impl(
const directory_entry& _From, const _STD filesystem::path& _To, copy_options _Options, error_code& _Ec);

Expand Down
39 changes: 9 additions & 30 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,9 +2327,6 @@ namespace ranges {
/* [[no_unique_address]] */ _Vw _Range{};
/* [[no_unique_address]] */ _Movable_box<_Fn> _Fun{};

template <bool _Const>
class _Sentinel;

template <bool _Const>
struct _Category_base {};

Expand All @@ -2347,10 +2344,7 @@ namespace ranges {
template <bool _Const>
class _Iterator : public _Category_base<_Const> {
private:
template <bool>
friend class _Iterator;
template <bool>
friend class _Sentinel;
friend transform_view;

using _Parent_t = _Maybe_const<_Const, transform_view>;
using _Base = _Maybe_const<_Const, _Vw>;
Expand Down Expand Up @@ -2600,8 +2594,7 @@ namespace ranges {
template <bool _Const>
class _Sentinel {
private:
template <bool>
friend class _Sentinel;
friend transform_view;

using _Parent_t = _Maybe_const<_Const, transform_view>;
using _Base = _Maybe_const<_Const, _Vw>;
Expand Down Expand Up @@ -2773,8 +2766,7 @@ namespace ranges {
template <bool _Const, bool _Wrapped = true>
class _Sentinel {
private:
template <bool, bool>
friend class _Sentinel;
friend take_view;

using _Base_t = _Maybe_const<_Const, _Vw>;
using _Base_sentinel = _Maybe_wrapped<_Wrapped, sentinel_t<_Base_t>>;
Expand Down Expand Up @@ -3067,8 +3059,7 @@ namespace ranges {
template <bool _Const, bool _Wrapped = true>
class _Sentinel {
private:
template <bool, bool>
friend class _Sentinel;
friend take_while_view;

using _Base_t = _Maybe_const<_Const, _Vw>;
using _Base_iterator = _Maybe_wrapped<_Wrapped, iterator_t<_Base_t>>;
Expand Down Expand Up @@ -4472,9 +4463,7 @@ namespace ranges {
template <bool _Const>
class _Outer_iter : public _Outer_iter_base<iterator_t<_Maybe_const<_Const, _Vw>>> {
private:
template <bool>
friend class _Inner_iter;
friend _Outer_iter<true>;
friend lazy_split_view;

using _Mybase = _Outer_iter_base<iterator_t<_Maybe_const<_Const, _Vw>>>;
using _ParentTy = _Maybe_const<_Const, lazy_split_view>;
Expand Down Expand Up @@ -4844,11 +4833,9 @@ namespace ranges {
/* [[no_unique_address]] */ _Pat _Pattern{};
_Non_propagating_cache<subrange<iterator_t<_Vw>>> _Next{};

class _Sentinel;

class _Iterator {
private:
friend _Sentinel;
friend split_view;

split_view* _Parent = nullptr;
iterator_t<_Vw> _Current = {};
Expand Down Expand Up @@ -5511,9 +5498,6 @@ namespace ranges {
private:
/* [[no_unique_address]] */ _Vw _Range{};

template <bool _Const>
class _Sentinel;

template <class _Base>
struct _Category_base {};

Expand All @@ -5529,10 +5513,7 @@ namespace ranges {
template <bool _Const>
class _Iterator : public _Category_base<_Maybe_const<_Const, _Vw>> {
private:
template <bool>
friend class _Iterator;
template <bool>
friend class _Sentinel;
friend elements_view;

using _Base = _Maybe_const<_Const, _Vw>;

Expand Down Expand Up @@ -5760,8 +5741,7 @@ namespace ranges {
template <bool _Const>
class _Sentinel {
private:
template <bool>
friend class _Sentinel;
friend elements_view;

using _Base = _Maybe_const<_Const, _Vw>;
template <bool _OtherConst>
Expand Down Expand Up @@ -6269,10 +6249,9 @@ namespace ranges {
range_difference_t<_Vw> _Remainder = 0;
_Non_propagating_cache<iterator_t<_Vw>> _Current{};

class _Outer_iterator;
class _Inner_iterator {
private:
friend struct _Outer_iterator::value_type;
friend chunk_view;
chunk_view* _Parent{};

constexpr explicit _Inner_iterator(chunk_view* _Parent_) noexcept : _Parent(_Parent_) {}
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/xlocale
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ public:
__PURE_APPDOMAIN_GLOBAL static int _Id_cnt;
};

class _Locimp;
struct _Facet_guard;

class _CRTIMP2_PURE_IMPORT facet : public _Facet_base, public _Crt_new_delete {
// base class for all locale facets, performs reference counting
private:
friend struct _Facet_guard;
friend _Facet_guard;

public:
static size_t __CLRCALL_OR_CDECL _Getcat(const facet** = nullptr, const locale* = nullptr) {
Expand Down