From d1fb6ad2bceb3a0e453751cef18782a2854f10be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Tue, 18 May 2021 13:08:25 +0200 Subject: [PATCH 1/3] unify spelling of word heterogeneous --- tests/common/map_wrapper.hpp | 6 +++--- tests/external/libcxx/map/is_transparent.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/common/map_wrapper.hpp b/tests/common/map_wrapper.hpp index 80b8fc7b3b..0657ea1372 100644 --- a/tests/common/map_wrapper.hpp +++ b/tests/common/map_wrapper.hpp @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2020, Intel Corporation */ +/* Copyright 2020-2021, Intel Corporation */ /* * map_wrapper.cpp -- wrapper for sharing tests between map-like data @@ -91,8 +91,8 @@ erase(C &m, Args &&... args) -> decltype(m.erase(std::forward(args)...)) #define MAP_KEY key() #define MAP_VALUE value() -#define TRANSPARENT_COMPARE heterogenous_bytes_view -#define TRANSPARENT_COMPARE_NOT_REFERENCEABLE heterogenous_bytes_view +#define TRANSPARENT_COMPARE heterogeneous_bytes_view +#define TRANSPARENT_COMPARE_NOT_REFERENCEABLE heterogeneous_bytes_view #define TRANSPARENT_COMPARE_STRING pmem::detail::bytes_view #endif diff --git a/tests/external/libcxx/map/is_transparent.h b/tests/external/libcxx/map/is_transparent.h index 0468f12425..e7829c4fa2 100644 --- a/tests/external/libcxx/map/is_transparent.h +++ b/tests/external/libcxx/map/is_transparent.h @@ -167,31 +167,31 @@ struct transparent_less_not_referenceable { void() const &; // it's a type; a weird one, but a type }; -struct heterogenous_bytes_view { - heterogenous_bytes_view(const int *value) +struct heterogeneous_bytes_view { + heterogeneous_bytes_view(const int *value) { v = (unsigned)(*value + (std::numeric_limits::max)() + 1); } - heterogenous_bytes_view(const C2Int *value) + heterogeneous_bytes_view(const C2Int *value) { v = (unsigned)(value->get() + (std::numeric_limits::max)() + 1); } - heterogenous_bytes_view(const Moveable *value) + heterogeneous_bytes_view(const Moveable *value) { v = (unsigned)(value->get() + (std::numeric_limits::max)() + 1); } - heterogenous_bytes_view(const MoveableWrapper *value) + heterogeneous_bytes_view(const MoveableWrapper *value) { v = (unsigned)(value->get().get() + (std::numeric_limits::max)() + 1); } - heterogenous_bytes_view(const PrivateConstructor *value) + heterogeneous_bytes_view(const PrivateConstructor *value) { v = (unsigned)(value->get() + (std::numeric_limits::max)() + 1); From ca7e878896e541f30b058905778c03191a9dbb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Tue, 18 May 2021 13:12:23 +0200 Subject: [PATCH 2/3] clean up gitignore file a little --- .gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9adaa18f7e..34132adbe1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,11 @@ .* -!.gitignore +!.clang-format !.gitattributes +!.gitignore !.github/ -!.clang-format !.mailmap !.version build/ *~ *.swp ~* -tags From 3ac2a7ee5a8c0eab7c3cc2a8d170c0cbdeabc27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Tue, 18 May 2021 16:19:29 +0200 Subject: [PATCH 3/3] doc: add concurrent_map link in containers' description --- include/libpmemobj++/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/libpmemobj++/README.md b/include/libpmemobj++/README.md index b0369bf257..beb5fa823c 100644 --- a/include/libpmemobj++/README.md +++ b/include/libpmemobj++/README.md @@ -139,3 +139,5 @@ have the well-known STL-like interface and they work with STL algorithms. [pmem::obj::concurrent_hash_map](@ref pmem::obj::concurrent_hash_map) * radix_tree (partially compatible with std::map) - [pmem::obj::experimental::radix_tree](@ref pmem::obj::experimental::radix_tree) + * concurrent_map (partially compatible with std::map) - + [pmem::obj::experimental::concurrent_map](@ref pmem::obj::experimental::concurrent_map)