diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fc26356..cde16d98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ -# xo-tree/CMakeLists.txt +# xo-ordinaltree/CMakeLists.txt cmake_minimum_required(VERSION 3.10) -project(xo_tree VERSION 0.1) +project(xo_ordinaltree VERSION 0.1) enable_language(CXX) # common XO macros (see github:Rconybea/xo-cmake) @@ -15,7 +15,7 @@ include(xo_macros/code-coverage) enable_testing() # enable code coverage for all executables+libraries # (when configured with -DCODE_COVERAGE=ON) -# +# add_code_coverage() add_code_coverage_all_targets( EXCLUDE @@ -33,7 +33,7 @@ xo_toplevel_compile_options() add_subdirectory(utest) -set(SELF_LIB xo_tree) +set(SELF_LIB xo_ordinaltree) add_library(${SELF_LIB} INTERFACE) xo_include_headeronly_options2(${SELF_LIB}) @@ -49,4 +49,3 @@ xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets # input dependencies xo_dependency_headeronly(${SELF_LIB} randomgen) - diff --git a/cmake/xo_treeConfig.cmake.in b/cmake/xo_ordinaltreeConfig.cmake.in similarity index 100% rename from cmake/xo_treeConfig.cmake.in rename to cmake/xo_ordinaltreeConfig.cmake.in diff --git a/include/xo/tree/BplusTree.hpp b/include/xo/ordinaltree/BplusTree.hpp similarity index 100% rename from include/xo/tree/BplusTree.hpp rename to include/xo/ordinaltree/BplusTree.hpp diff --git a/include/xo/tree/RedBlackTree.hpp b/include/xo/ordinaltree/RedBlackTree.hpp similarity index 100% rename from include/xo/tree/RedBlackTree.hpp rename to include/xo/ordinaltree/RedBlackTree.hpp diff --git a/include/xo/tree/bplustree/BplusTreeUtil.hpp b/include/xo/ordinaltree/bplustree/BplusTreeUtil.hpp similarity index 100% rename from include/xo/tree/bplustree/BplusTreeUtil.hpp rename to include/xo/ordinaltree/bplustree/BplusTreeUtil.hpp diff --git a/include/xo/tree/bplustree/GenericNode.hpp b/include/xo/ordinaltree/bplustree/GenericNode.hpp similarity index 100% rename from include/xo/tree/bplustree/GenericNode.hpp rename to include/xo/ordinaltree/bplustree/GenericNode.hpp diff --git a/include/xo/tree/bplustree/InternalNode.hpp b/include/xo/ordinaltree/bplustree/InternalNode.hpp similarity index 100% rename from include/xo/tree/bplustree/InternalNode.hpp rename to include/xo/ordinaltree/bplustree/InternalNode.hpp diff --git a/include/xo/tree/bplustree/Iterator.hpp b/include/xo/ordinaltree/bplustree/Iterator.hpp similarity index 100% rename from include/xo/tree/bplustree/Iterator.hpp rename to include/xo/ordinaltree/bplustree/Iterator.hpp diff --git a/include/xo/tree/bplustree/IteratorUtil.hpp b/include/xo/ordinaltree/bplustree/IteratorUtil.hpp similarity index 100% rename from include/xo/tree/bplustree/IteratorUtil.hpp rename to include/xo/ordinaltree/bplustree/IteratorUtil.hpp diff --git a/include/xo/tree/bplustree/LeafNode.hpp b/include/xo/ordinaltree/bplustree/LeafNode.hpp similarity index 100% rename from include/xo/tree/bplustree/LeafNode.hpp rename to include/xo/ordinaltree/bplustree/LeafNode.hpp diff --git a/include/xo/tree/bplustree/Lhs.hpp b/include/xo/ordinaltree/bplustree/Lhs.hpp similarity index 100% rename from include/xo/tree/bplustree/Lhs.hpp rename to include/xo/ordinaltree/bplustree/Lhs.hpp diff --git a/include/xo/tree/bplustree/bplustree_tags.hpp b/include/xo/ordinaltree/bplustree/bplustree_tags.hpp similarity index 100% rename from include/xo/tree/bplustree/bplustree_tags.hpp rename to include/xo/ordinaltree/bplustree/bplustree_tags.hpp diff --git a/utest/bplustree.cpp b/utest/bplustree.cpp index 5dac55a8..d7ca3aaf 100644 --- a/utest/bplustree.cpp +++ b/utest/bplustree.cpp @@ -3,7 +3,7 @@ #define CATCH_CONFIG_ENABLE_BENCHMARKING #include "random_tree_ops.hpp" -#include "xo/tree/BplusTree.hpp" +#include "xo/ordinaltree/BplusTree.hpp" #include "randomgen/random_seed.hpp" #include "indentlog/scope.hpp" #include "catch2/catch.hpp" diff --git a/utest/redblacktree.cpp b/utest/redblacktree.cpp index 658abf64..f33db805 100644 --- a/utest/redblacktree.cpp +++ b/utest/redblacktree.cpp @@ -1,7 +1,7 @@ /* @file redblacktree.cpp */ #include "random_tree_ops.hpp" -#include "xo/tree/RedBlackTree.hpp" +#include "xo/ordinaltree/RedBlackTree.hpp" #include namespace {