diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f35416..d4725f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,6 @@ if(BUILD_TESTING) target_compile_options(skip_list PRIVATE -fPIC -fno-exceptions -fvisibility=hidden) target_include_directories(skip_list PUBLIC ${CMAKE_SOURCE_DIR}/include) - set_target_properties(skip_list PROPERTIES LINKER_LANGUAGE C) set_target_properties(skip_list PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/skip_list") set_target_properties(skip_list PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index 49783fc..0e984e9 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -1825,11 +1825,6 @@ Iterator firstGeq(Node *n, const std::span key) { return {stepwise.n, stepwise.cmp}; } -Iterator firstGeq(Node *n, std::string_view key) { - return firstGeq( - n, std::span((const uint8_t *)key.data(), key.size())); -} - struct __attribute__((visibility("hidden"))) ConflictSet::Impl { void check(const ReadRange *reads, Result *result, int count) { @@ -2150,6 +2145,11 @@ void checkParentPointers(Node *node, bool &success) { } } +Iterator firstGeq(Node *n, std::string_view key) { + return firstGeq( + n, std::span((const uint8_t *)key.data(), key.size())); +} + [[maybe_unused]] int64_t checkMaxVersion(Node *root, Node *node, int64_t oldestVersion, bool &success, ConflictSet::Impl *impl) {