v1.6.1 (#146)

tzaeschke · Apr 13, 2023 · 3d06d8a · 3d06d8a
1 parent 04725c3
commit 3d06d8a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Nothing yet
+
+## [1.6.1] - 2023-04-13
 ### Changed
 - Renamed `CALLBACK` to `CALLBACK_FN` to avoid conflicts with Windows SDK.
   [#142](https://github.com/tzaeschke/phtree-cpp/issues/142)
@@ -231,7 +234,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Nothing.
 
 
-[Unreleased]: https://github.com/improbable-eng/phtree-cpp/compare/v1.6.0...HEAD
+[Unreleased]: https://github.com/improbable-eng/phtree-cpp/compare/v1.6.1...HEAD
+[1.6.1]: https://github.com/improbable-eng/phtree-cpp/compare/v1.6.0...v1.6.1
 [1.6.0]: https://github.com/improbable-eng/phtree-cpp/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/improbable-eng/phtree-cpp/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/improbable-eng/phtree-cpp/compare/v1.3.0...v1.4.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(phtree VERSION 1.6.0
+project(phtree VERSION 1.6.1
         DESCRIPTION "PH-Tree C++"
         HOMEPAGE_URL "https://github.com/tzaeschke/phtree-cpp"
         LANGUAGES CXX)

diff --git a/README.md b/README.md
@@ -572,7 +572,7 @@ __before__ importing any Windows SDK dependencies.
 ```
 http_archive(
     name = "phtree",
-    strip_prefix = "phtree-cpp-v1.6.0",
+    strip_prefix = "phtree-cpp-v1.6.1",
     url = "https://github.com/tzaeschke/phtree-cpp",
 )
 ```
@@ -614,7 +614,7 @@ include(FetchContent)
 FetchContent_Declare(
         phtree
         GIT_REPOSITORY https://github.com/tzaeschke/phtree-cpp.git
-        GIT_TAG v1.6.0
+        GIT_TAG v1.6.1
 )
 FetchContent_MakeAvailable(phtree)
 ```

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -57,6 +57,10 @@ if (PHTREE_CODE_COVERAGE)
             phtree_multimap_box_d_test.cc
             common/b_plus_tree_hash_map_test.cc
             common/b_plus_tree_map_test.cc
+            common/b_plus_tree_multimap_test.cc
+            # Disabled, see issue #147
+            # common/b_priority_queue_test.cc
+            # common/b_vector_test.cc
             common/base_types_test.cc
             common/bits_test.cc
             common/common_test.cc

diff --git a/test/common/b_priority_queue_test.cc b/test/common/b_priority_queue_test.cc
@@ -194,7 +194,7 @@ void SmokeTest() {
     }
 }
 
-TEST(PhTreeBptHeapTest, SmokeTest) {
+TEST(PhTreeBptPriorityQueueTest, SmokeTest) {
     SmokeTest();
 }
 
@@ -260,11 +260,11 @@ void SmokeTestTop() {
     }
 }
 
-TEST(PhTreeBptHeapTest, SmokeTestTop) {
+TEST(PhTreeBptPriorityQueueTest, SmokeTestTop) {
     SmokeTestTop();
 }
 
-TEST(PhTreeBptHeapTest, DestructionTest) {
+TEST(PhTreeBptPriorityQueueTest, DestructionTest) {
     const size_t N = 1000;
     std::default_random_engine random_engine{0};
     std::uniform_int_distribution<> cube_distribution(0, N / 2);
@@ -307,7 +307,7 @@ void test_tree(TREE& tree) {
     ASSERT_TRUE(tree.empty());
 }
 
-TEST(PhTreeBptMulitmapTest, TestCopyConstruct) {
+TEST(PhTreeBptPriorityQueueTest, TestCopyConstruct) {
     using TestTree = detail::priority_queue<Id, IdComparator>;
     TestTree tree1;
     tree1.emplace(Id(42, 1));
@@ -318,7 +318,7 @@ TEST(PhTreeBptMulitmapTest, TestCopyConstruct) {
     test_tree(tree1);
 }
 
-TEST(PhTreeBptMulitmapTest, TestCopyAssign) {
+TEST(PhTreeBptPriorityQueueTest, TestCopyAssign) {
     using TestTree = detail::priority_queue<Id, IdComparator>;
     TestTree tree1;
     tree1.emplace(Id(42, 1));
@@ -330,7 +330,7 @@ TEST(PhTreeBptMulitmapTest, TestCopyAssign) {
     test_tree(tree1);
 }
 
-TEST(PhTreeBptMulitmapTest, TestMoveConstruct) {
+TEST(PhTreeBptPriorityQueueTest, TestMoveConstruct) {
     using TestTree = detail::priority_queue<Id, IdComparator>;
     TestTree tree1;
     tree1.emplace(Id(42, 1));
@@ -339,7 +339,7 @@ TEST(PhTreeBptMulitmapTest, TestMoveConstruct) {
     test_tree(tree);
 }
 
-TEST(PhTreeBptMulitmapTest, TestMoveAssign) {
+TEST(PhTreeBptPriorityQueueTest, TestMoveAssign) {
     using TestTree = detail::priority_queue<Id, IdComparator>;
     TestTree tree1;
     tree1.emplace(Id(42, 1));