Skip to content

Commit

Permalink
bump version to 3.0.2 for libc++ pmr fix
Browse files Browse the repository at this point in the history
Also fix clang-format
  • Loading branch information
martinus committed Jan 7, 2023
1 parent 2d8a192 commit 612f2b5
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.12)
project("unordered_dense"
VERSION 3.0.1
VERSION 3.0.2
DESCRIPTION "A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion"
HOMEPAGE_URL "https://github.com/martinus/unordered_dense")

Expand Down
4 changes: 2 additions & 2 deletions include/ankerl/unordered_dense.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
///////////////////////// ankerl::unordered_dense::{map, set} /////////////////////////

// A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion.
// Version 3.0.1
// Version 3.0.2
// https://github.com/martinus/unordered_dense
//
// Licensed under the MIT License <http://opensource.org/licenses/MIT>.
Expand Down Expand Up @@ -32,7 +32,7 @@
// see https://semver.org/spec/v2.0.0.html
#define ANKERL_UNORDERED_DENSE_VERSION_MAJOR 3 // NOLINT(cppcoreguidelines-macro-usage) incompatible API changes
#define ANKERL_UNORDERED_DENSE_VERSION_MINOR 0 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible functionality
#define ANKERL_UNORDERED_DENSE_VERSION_PATCH 1 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible bug fixes
#define ANKERL_UNORDERED_DENSE_VERSION_PATCH 2 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible bug fixes

// API versioning with inline namespace, see https://www.foonathan.net/2018/11/inline-namespaces/
#define ANKERL_UNORDERED_DENSE_VERSION_CONCAT1(major, minor, patch) v##major##_##minor##_##patch
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

project('unordered_dense', 'cpp',
version: '3.0.1',
version: '3.0.2',
license: 'MIT',
default_options : ['cpp_std=c++17', 'warning_level=3', 'werror=true'])

Expand Down
6 changes: 3 additions & 3 deletions test/unit/namespace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

#include <doctest.h>

static_assert(std::is_same_v<ankerl::unordered_dense::v3_0_1::map<int, int>, ankerl::unordered_dense::map<int, int>>);
static_assert(std::is_same_v<ankerl::unordered_dense::v3_0_1::hash<int>, ankerl::unordered_dense::hash<int>>);
static_assert(std::is_same_v<ankerl::unordered_dense::v3_0_2::map<int, int>, ankerl::unordered_dense::map<int, int>>);
static_assert(std::is_same_v<ankerl::unordered_dense::v3_0_2::hash<int>, ankerl::unordered_dense::hash<int>>);

TEST_CASE("version_namespace") {
auto map = ankerl::unordered_dense::v3_0_1::map<int, int>{};
auto map = ankerl::unordered_dense::v3_0_2::map<int, int>{};
REQUIRE(map.empty());
}
6 changes: 3 additions & 3 deletions test/unit/pmr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#if ANKERL_UNORDERED_DENSE_PMR

# if __has_include(<memory_resource>)
# include <memory_resource>
# include <memory_resource>

class logging_memory_resource : public std::pmr::memory_resource {
auto do_allocate(std::size_t bytes, std::size_t alignment) -> void* override {
Expand Down Expand Up @@ -145,7 +145,7 @@ void show([[maybe_unused]] track_peak_memory_resource const& mr, [[maybe_unused]
}

// windows' vector has different allocation behavior
# ifndef _WIN32
# ifndef _WIN32
TEST_CASE("pmr_copy") {
auto mr1 = track_peak_memory_resource();
auto map1 = ankerl::unordered_dense::pmr::map<uint64_t, uint64_t>(&mr1);
Expand Down Expand Up @@ -219,7 +219,7 @@ TEST_CASE("pmr_move_same_mr") {
REQUIRE(mr1.num_deallocs() == 2);
REQUIRE(mr1.num_is_equals() == 0);
}
# endif
# endif

# endif
#endif

0 comments on commit 612f2b5

Please sign in to comment.