Skip to content
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

Do not use else after return #84

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not use else after return #84

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
3 changes: 1 addition & 2 deletions include/tsl/robin_growth_policy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,8 @@ class mod_growth_policy {

if (next_bucket_count > double(max_bucket_count())) {
return max_bucket_count();
} else {
return std::size_t(next_bucket_count);
}
return std::size_t(next_bucket_count);
}

std::size_t max_bucket_count() const { return MAX_BUCKET_COUNT; }
Expand Down
22 changes: 9 additions & 13 deletions include/tsl/robin_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,14 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
if (STORE_HASH && sizeof(std::size_t) == sizeof(truncated_hash_type)) {
TSL_RH_UNUSED(bucket_count);
return true;
} else if (STORE_HASH && is_power_of_two_policy<GrowthPolicy>::value) {
}
if (STORE_HASH && is_power_of_two_policy<GrowthPolicy>::value) {
return bucket_count == 0 ||
(bucket_count - 1) <=
std::numeric_limits<truncated_hash_type>::max();
} else {
TSL_RH_UNUSED(bucket_count);
return false;
}
TSL_RH_UNUSED(bucket_count);
return false;
}

using bucket_entry =
Expand Down Expand Up @@ -863,9 +863,8 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
if (it != end()) {
erase_from_bucket(it);
return 1;
} else {
return 0;
}
return 0;
}

void swap(robin_hash& other) {
Expand Down Expand Up @@ -913,9 +912,8 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
auto it = find(key, hash);
if (it != cend()) {
return it.value();
} else {
TSL_RH_THROW_OR_TERMINATE(std::out_of_range, "Couldn't find key.");
}
TSL_RH_THROW_OR_TERMINATE(std::out_of_range, "Couldn't find key.");
}

template <class K, class U = ValueSelect,
Expand All @@ -933,9 +931,8 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
size_type count(const K& key, std::size_t hash) const {
if (find(key, hash) != cend()) {
return 1;
} else {
return 0;
}
return 0;
}

template <class K>
Expand Down Expand Up @@ -1308,10 +1305,9 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
m_buckets[ibucket].set_value_of_empty_bucket(dist_from_ideal_bucket,
hash, std::move(value));
return;
} else {
m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket,
hash, value);
}
m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket,
hash, value);
}

dist_from_ideal_bucket++;
Expand Down
3 changes: 1 addition & 2 deletions tests/robin_map_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,9 +1224,8 @@ BOOST_AUTO_TEST_CASE(test_key_equal) {
std::size_t operator()(std::uint64_t v) const {
if (v % 2u == 1u) {
return std::hash<std::uint64_t>()(v - 1);
} else {
return std::hash<std::uint64_t>()(v);
}
return std::hash<std::uint64_t>()(v);
}
};

Expand Down
12 changes: 6 additions & 6 deletions tests/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,8 @@ class move_only_test {
friend bool operator==(const move_only_test& lhs, const move_only_test& rhs) {
if (lhs.m_value == nullptr || rhs.m_value == nullptr) {
return lhs.m_value == nullptr && rhs.m_value == nullptr;
} else {
return *lhs.m_value == *rhs.m_value;
}
return *lhs.m_value == *rhs.m_value;
}

friend bool operator!=(const move_only_test& lhs, const move_only_test& rhs) {
Expand All @@ -164,13 +163,14 @@ class move_only_test {
friend bool operator<(const move_only_test& lhs, const move_only_test& rhs) {
if (lhs.m_value == nullptr && rhs.m_value == nullptr) {
return false;
} else if (lhs.m_value == nullptr) {
}
if (lhs.m_value == nullptr) {
return true;
} else if (rhs.m_value == nullptr) {
}
if (rhs.m_value == nullptr) {
return false;
} else {
return *lhs.m_value < *rhs.m_value;
}
return *lhs.m_value < *rhs.m_value;
}

const std::string& value() const { return *m_value; }
Expand Down