Skip to content

Commit f15138b

Browse files
committed
Merge branch 'refactor/move-async-registry-server' into feature/task-registry-feature
2 parents 7632117 + c6a758b commit f15138b

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

lib/Containers/Forest/forest.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ struct Forest {
7070

7171
std::vector<Id> _parent = {}; // has one entry for each node
7272
std::vector<Node> _node = {}; // has one entry for each node
73-
// at which position of the vectors _waiter and _data to find
74-
// entries for Id
73+
// at which position of the vectors _waiter and _data to find entries for Id
7574
std::unordered_map<Id, size_t> _position = {};
7675
};
7776

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ endif()
327327

328328
target_link_libraries(arangodbtests
329329
arango
330-
arango_tests_forest
331330
arango_tests_basics
331+
arango_tests_forest
332332
arango_tests_replication2
333333
arango_tests_replication2_pure
334334
arango_tests_task_registry

tests/Containers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
add_subdirectory(Concurrent)
2-
31
add_library(arango_tests_forest OBJECT
42
ForestTest.cpp)
53
target_link_libraries(arango_tests_forest PRIVATE
@@ -10,3 +8,5 @@ add_executable(arangodbtests_forest EXCLUDE_FROM_ALL)
108
target_link_libraries(arangodbtests_forest
119
arango_tests_forest
1210
gtest_main)
11+
12+
add_subdirectory(Concurrent)

0 commit comments

Comments
 (0)