Skip to content

_NODISCARD for <hash_map> and <hash_set> #1574

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
StephanTLavavej merged 3 commits into from
Jan 26, 2021
Merged

_NODISCARD for <hash_map> and <hash_set> #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44fd821
_NODISCARD for <hash_set>
celonymire Jan 17, 2021
3af9d14
_NODISCARD for <hash_map>
celonymire Jan 17, 2021
525ef41
Code review feedback.
StephanTLavavej Jan 23, 2021
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
37 changes: 19 additions & 18 deletions stl/inc/hash_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,21 @@ namespace stdext {
};

template <class _Ty1, class _Ty2>
static const _Kty& _Kfn(const pair<_Ty1, _Ty2>& _Val) noexcept { // extract key from element value
_NODISCARD static const _Kty& _Kfn(const pair<_Ty1, _Ty2>& _Val) noexcept { // extract key from element value
return _Val.first;
}

template <class _Ty1, class _Ty2>
static const _Ty2& _Nonkfn(const pair<_Ty1, _Ty2>& _Val) noexcept { // extract non-key from element value
_NODISCARD static const _Ty2& _Nonkfn(const pair<_Ty1, _Ty2>& _Val) noexcept {
// extract non-key from element value
return _Val.second;
}

float& _Get_max_bucket_size() noexcept {
_NODISCARD float& _Get_max_bucket_size() noexcept {
return _Max_buckets;
}

const float& _Get_max_bucket_size() const noexcept {
_NODISCARD const float& _Get_max_bucket_size() const noexcept {
return _Max_buckets;
}

Expand Down Expand Up @@ -224,7 +225,7 @@ namespace stdext {
return this->_Try_emplace(_Keyval).first->_Myval.second;
}

mapped_type& at(const key_type& _Keyval) {
_NODISCARD mapped_type& at(const key_type& _Keyval) {
const auto _Target = this->_Find_last(_Keyval, this->_Traitsobj(_Keyval));
if (_Target._Duplicate) {
return _Target._Duplicate->_Myval.second;
Expand All @@ -233,7 +234,7 @@ namespace stdext {
_Xout_of_range("invalid hash_map<K, T> key");
}

const mapped_type& at(const key_type& _Keyval) const {
_NODISCARD const mapped_type& at(const key_type& _Keyval) const {
const auto _Target = this->_Find_last(_Keyval, this->_Traitsobj(_Keyval));
if (_Target._Duplicate) {
return _Target._Duplicate->_Myval.second;
Expand All @@ -245,27 +246,27 @@ namespace stdext {
using reverse_iterator = _STD reverse_iterator<iterator>;
using const_reverse_iterator = _STD reverse_iterator<const_iterator>;

reverse_iterator rbegin() noexcept {
_NODISCARD reverse_iterator rbegin() noexcept {
return reverse_iterator(this->end());
}

const_reverse_iterator rbegin() const noexcept {
_NODISCARD const_reverse_iterator rbegin() const noexcept {
return const_reverse_iterator(this->end());
}

reverse_iterator rend() noexcept {
_NODISCARD reverse_iterator rend() noexcept {
return reverse_iterator(this->begin());
}

const_reverse_iterator rend() const noexcept {
_NODISCARD const_reverse_iterator rend() const noexcept {
return const_reverse_iterator(this->begin());
}

const_reverse_iterator crbegin() const noexcept {
_NODISCARD const_reverse_iterator crbegin() const noexcept {
return rbegin();
}

const_reverse_iterator crend() const noexcept {
_NODISCARD const_reverse_iterator crend() const noexcept {
return rend();
}

Expand Down Expand Up @@ -406,27 +407,27 @@ namespace stdext {
using reverse_iterator = _STD reverse_iterator<iterator>;
using const_reverse_iterator = _STD reverse_iterator<const_iterator>;

reverse_iterator rbegin() noexcept {
_NODISCARD reverse_iterator rbegin() noexcept {
return reverse_iterator(this->end());
}

const_reverse_iterator rbegin() const noexcept {
_NODISCARD const_reverse_iterator rbegin() const noexcept {
return const_reverse_iterator(this->end());
}

reverse_iterator rend() noexcept {
_NODISCARD reverse_iterator rend() noexcept {
return reverse_iterator(this->begin());
}

const_reverse_iterator rend() const noexcept {
_NODISCARD const_reverse_iterator rend() const noexcept {
return const_reverse_iterator(this->begin());
}

const_reverse_iterator crbegin() const noexcept {
_NODISCARD const_reverse_iterator crbegin() const noexcept {
return rbegin();
}

const_reverse_iterator crend() const noexcept {
_NODISCARD const_reverse_iterator crend() const noexcept {
return rend();
}

Expand Down
32 changes: 16 additions & 16 deletions stl/inc/hash_set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ namespace stdext {

using value_compare = key_compare;

static const _Kty& _Kfn(const value_type& _Val) noexcept {
_NODISCARD static const _Kty& _Kfn(const value_type& _Val) noexcept {
return _Val;
}

static int _Nonkfn(const value_type&) noexcept {
_NODISCARD static int _Nonkfn(const value_type&) noexcept {
// extract "non-key" from element value (for container equality)
return 0;
}

float& _Get_max_bucket_size() noexcept {
_NODISCARD float& _Get_max_bucket_size() noexcept {
return _Max_buckets;
}

const float& _Get_max_bucket_size() const noexcept {
_NODISCARD const float& _Get_max_bucket_size() const noexcept {
return _Max_buckets;
}

Expand Down Expand Up @@ -181,27 +181,27 @@ namespace stdext {
using reverse_iterator = _STD reverse_iterator<iterator>;
using const_reverse_iterator = _STD reverse_iterator<const_iterator>;

reverse_iterator rbegin() noexcept {
_NODISCARD reverse_iterator rbegin() noexcept {
return reverse_iterator(this->end());
}

const_reverse_iterator rbegin() const noexcept {
_NODISCARD const_reverse_iterator rbegin() const noexcept {
return const_reverse_iterator(this->end());
}

reverse_iterator rend() noexcept {
_NODISCARD reverse_iterator rend() noexcept {
return reverse_iterator(this->begin());
}

const_reverse_iterator rend() const noexcept {
_NODISCARD const_reverse_iterator rend() const noexcept {
return const_reverse_iterator(this->begin());
}

const_reverse_iterator crbegin() const noexcept {
_NODISCARD const_reverse_iterator crbegin() const noexcept {
return rbegin();
}

const_reverse_iterator crend() const noexcept {
_NODISCARD const_reverse_iterator crend() const noexcept {
return rend();
}

Expand Down Expand Up @@ -325,27 +325,27 @@ namespace stdext {
using reverse_iterator = _STD reverse_iterator<iterator>;
using const_reverse_iterator = _STD reverse_iterator<const_iterator>;

reverse_iterator rbegin() noexcept {
_NODISCARD reverse_iterator rbegin() noexcept {
return reverse_iterator(this->end());
}

const_reverse_iterator rbegin() const noexcept {
_NODISCARD const_reverse_iterator rbegin() const noexcept {
return const_reverse_iterator(this->end());
}

reverse_iterator rend() noexcept {
_NODISCARD reverse_iterator rend() noexcept {
return reverse_iterator(this->begin());
}

const_reverse_iterator rend() const noexcept {
_NODISCARD const_reverse_iterator rend() const noexcept {
return const_reverse_iterator(this->begin());
}

const_reverse_iterator crbegin() const noexcept {
_NODISCARD const_reverse_iterator crbegin() const noexcept {
return rbegin();
}

const_reverse_iterator crend() const noexcept {
_NODISCARD const_reverse_iterator crend() const noexcept {
return rend();
}

Expand Down