Skip to content

fix universal: use std::addressof in FindTransparentOrNullptr #1211

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

Open
ddvamp wants to merge 1 commit into
base: develop
Choose a base branch
from
+17 −1
Open

fix universal: use std::addressof in FindTransparentOrNullptr #1211

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: 2 additions & 1 deletion universal/include/userver/utils/impl/transparent_hash.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <functional>
#include <memory>
#include <string_view>

#if defined(USERVER_IMPL_ORIGINAL_CXX_STANDARD)
Expand Down Expand Up @@ -85,7 +86,7 @@ template <typename TransparentMap, typename Key>
auto* FindTransparentOrNullptr(TransparentMap&& map, const Key& key) {
static_assert(!std::is_rvalue_reference_v<TransparentMap>, "Dangling");
const auto iterator = FindTransparent(map, key);
return iterator == map.end() ? nullptr : &iterator->second;
return iterator == map.end() ? nullptr : std::addressof(iterator->second);
}

template <typename TransparentMap, typename Key, typename Value>
Expand Down
15 changes: 15 additions & 0 deletions universal/src/utils/impl/transparent_hash_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,21 @@ TEST(TransparentMap, FindTransparentOrNullptr) {
EXPECT_EQ(FindTransparentOrNullptr(const_map, "bar"), nullptr);
}

TEST(TransparentMap, FindTransparentOrNullptrAddressof) {
struct Overloaded {
bool used = false;
auto operator&() {
used = true;
return this;
};
};

utils::impl::TransparentMap<std::string, Overloaded> m{{{"1"}, {.used = false}}};
const auto* ptr = FindTransparentOrNullptr(m, "1");
ASSERT_TRUE(ptr);
EXPECT_FALSE(ptr->used);
}

TEST(TransparentMap, CustomValue) {
using Map = utils::impl::TransparentMap<StringViewable, int>;
static_assert(meta::IsUniqueMap<Map>);
Expand Down
Loading