Commit e1c2a646 authored by Philipp Götze's avatar Philipp Götze

Merge branch 'master' into more_data_structures

parents f196f4f8 f173a8c4
Pipeline #678 passed with stages
in 6 minutes and 48 seconds
......@@ -362,6 +362,7 @@ reInsert:
}
}
}
return nullptr;
}
ValueType* search(const KeyType key) const {
......@@ -394,6 +395,6 @@ reInsert:
}; /// end class woPSkiplist
} /// namespace dbis::pbptrees
} /// namespace dbis::pskiplists
#endif /// WOP_SKIPLIST_HPP
......@@ -18,13 +18,12 @@
#ifndef BASETRIE_HPP
#define BASETRIE_HPP
#include <zconf.h>
// std
#include <array>
#include <memory>
#include <cmath>
#include <iostream>
#include <memory>
#include <unistd.h>
// pmdk
#include <libpmemobj++/make_persistent.hpp>
......
......@@ -20,11 +20,10 @@
#include "utils/PatriciaUtils.hpp"
#include <zconf.h>
#include <cstdlib>
#include <sstream>
#include <iostream>
#include <sstream>
#include <unistd.h>
#include <libpmemobj++/persistent_ptr.hpp>
#include <libpmemobj++/utils.hpp>
......
......@@ -25,7 +25,6 @@
#include <random>
#include <chrono>
#include <zconf.h>
#include <assert.h>
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment