Sort headers, fix const_iterator bug, optimize sizes for skylake.

Author: det

CMakeLists.txt

@@ -18,8 +18,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   add_definitions(-DBOOST_SEGMENTED_TREE_DEBUG)
 endif ()
 
-
-find_package(Boost)
+find_package(Boost COMPONENTS unit_test_framework REQUIRED)
 include_directories (include)
 include_directories (SYSTEM submodule)
 include_directories (SYSTEM ${Boost_INCLUDE_DIRS})

bench/iterator.hpp

@@ -1,12 +1,11 @@
 #ifndef BENCH_ITERATOR
 #define BENCH_ITERATOR
 
-#include "common.hpp"
-#include "../common/iterator.hpp"
-
 #include <stdexcept>
 #include <type_traits>
 #include <vector>
+#include "../common/iterator.hpp"
+#include "common.hpp"
 
 template <typename Container, typename T>
 void bench_iterator(Container const &container, std::vector<T> const &data) {

bench/range_btree_seq_64.cpp

@@ -1,5 +1,5 @@
-#include "range.hpp"
 #include "array/trunk/btree_seq.h"
+#include "range.hpp"
 
 template <typename T>
 using Container = btree_seq<T>;

bench/range_btree_seq_8.cpp

@@ -1,5 +1,5 @@
-#include "range.hpp"
 #include "array/trunk/btree_seq.h"
+#include "range.hpp"
 
 template <typename T>
 using Container = btree_seq<T>;

bench/range_deque_8.cpp

@@ -1,6 +1,5 @@
-#include "range.hpp"
-
 #include <deque>
+#include "range.hpp"
 
 template <typename T>
 using Container = std::deque<T>;

bench/range_segmented_tree_seq_64.cpp

@@ -1,5 +1,5 @@
-#include "range.hpp"
 #include "boost/segmented_tree/seq.hpp"
+#include "range.hpp"
 
 template <typename T>
 using Container = boost::segmented_tree::seq<T>;

bench/range_vector_64.cpp

@@ -1,6 +1,5 @@
-#include "range.hpp"
-
 #include <vector>
+#include "range.hpp"
 
 template <typename T>
 using Container = std::vector<T>;

bench/range_vector_8.cpp

@@ -1,6 +1,5 @@
-#include "range.hpp"
-
 #include <vector>
+#include "range.hpp"
 
 template <typename T>
 using Container = std::vector<T>;

bench/single.hpp

@@ -1,12 +1,11 @@
 #ifndef BENCH_SINGLE
 #define BENCH_SINGLE
 
-#include "iterator.hpp"
-#include "../common/single.hpp"
-
+#include <boost/lexical_cast.hpp>
 #include <cstdlib>
 #include <limits>
-#include <boost/lexical_cast.hpp>
+#include "../common/single.hpp"
+#include "iterator.hpp"
 
 template <template <typename T> class Container, typename T>
 int bench_single(int argc, char **argv) {

bench/single_btree_seq_64.cpp

@@ -1,5 +1,5 @@
-#include "single.hpp"
 #include "array/trunk/btree_seq.h"
+#include "single.hpp"
 
 template <typename T>
 using Container = btree_seq<T>;

bench/single_btree_seq_8.cpp

@@ -1,5 +1,5 @@
-#include "single.hpp"
 #include "array/trunk/btree_seq.h"
+#include "single.hpp"
 
 template <typename T>
 using Container = btree_seq<T>;

bench/single_deque_64.cpp

@@ -1,6 +1,5 @@
-#include "single.hpp"
-
 #include <deque>
+#include "single.hpp"
 
 template <typename T>
 using Container = std::deque<T>;

bench/single_deque_8.cpp

@@ -1,6 +1,5 @@
-#include "single.hpp"
-
 #include <deque>
+#include "single.hpp"
 
 template <typename T>
 using Container = std::deque<T>;

bench/single_segmented_tree_seq_64.cpp

@@ -1,5 +1,5 @@
-#include "single.hpp"
 #include "boost/segmented_tree/seq.hpp"
+#include "single.hpp"
 
 template <typename T>
 using Container = boost::segmented_tree::seq<T>;

bench/single_segmented_tree_seq_8.cpp

@@ -1,5 +1,5 @@
-#include "single.hpp"
 #include "boost/segmented_tree/seq.hpp"
+#include "single.hpp"
 
 template <typename T>
 using Container = boost::segmented_tree::seq<T>;

bench/single_vector_64.cpp

@@ -1,6 +1,5 @@
-#include "single.hpp"
-
 #include <vector>
+#include "single.hpp"
 
 template <typename T>
 using Container = std::vector<T>;

bench/single_vector_8.cpp

@@ -1,6 +1,5 @@
-#include "single.hpp"
-
 #include <vector>
+#include "single.hpp"
 
 template <typename T>
 using Container = std::vector<T>;

common/common.hpp

@@ -1,15 +1,15 @@
 #ifndef COMMON_COMMON
 #define COMMON_COMMON
 
-#include <cstdint>
-#include <cstdlib>
-#include <type_traits>
-#include <vector>
 #include <boost/crc.hpp>
 #include <boost/random/independent_bits.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/seed_seq.hpp>
+#include <cstdint>
+#include <cstdlib>
 #include <random>
+#include <type_traits>
+#include <vector>
 
 template <typename T>
 struct insertion_data {

common/generate_range.hpp

@@ -1,10 +1,9 @@
 #ifndef BENCH_GENERATE_RANGE
 #define BENCH_GENERATE_RANGE
 
-#include "range.hpp"
-
-#include <iostream>
 #include <boost/lexical_cast.hpp>
+#include <iostream>
+#include "range.hpp"
 
 template <typename T>
 int generate_range(int argc, char **argv) {

common/generate_single.hpp

@@ -1,10 +1,9 @@
 #ifndef BENCH_GENERATE_SINGLE
 #define BENCH_GENERATE_SINGLE
 
-#include "single.hpp"
-
-#include <iostream>
 #include <boost/lexical_cast.hpp>
+#include <iostream>
+#include "single.hpp"
 
 template <typename T>
 int generate_single(int argc, char **argv) {

include/boost/segmented_tree/seq.hpp

@@ -7,12 +7,13 @@
 
 #include "seq_fwd.hpp"
 
-#include <array>
 #include <algorithm>
+#include <array>
 #include <cstring>
+#include <functional>
 #include <limits>
-#include <utility>
 #include <type_traits>
+#include <utility>
 
 #ifdef BOOST_SEGMENTED_TREE_DEBUG
 #include <iostream>
@@ -3533,7 +3534,8 @@ class seq {
   ///   Basic.
   void splice(const_iterator pos, seq &other, const_iterator first,
               const_iterator last) {
-    insert(pos, std::make_move_iterator(first), std::make_move_iterator(last));
+    insert(pos, std::make_move_iterator(iterator{first.it_}),
+           std::make_move_iterator(iterator{last.it_}));
     other.erase(first, last);
   }
 

include/boost/segmented_tree/seq_fwd.hpp

@@ -10,7 +10,7 @@
 namespace boost {
 namespace segmented_tree {
 template <typename T, typename Allocator = std::allocator<T>,
-          std::size_t segment_target = 512, std::size_t base_target = 512>
+          std::size_t segment_target = 1024, std::size_t base_target = 768>
 class seq;
 }
 }

test/CMakeLists.txt

@@ -1,10 +1,10 @@
 add_executable(test_sequence_0 test_sequence.cpp)
-target_link_libraries(test_sequence_0 boost_unit_test_framework)
+target_link_libraries(test_sequence_0 ${Boost_LIBRARIES})
 set_property(TARGET test_sequence_0 PROPERTY COMPILE_DEFINITIONS
              BOOST_TEST_DYN_LINK TARGET_SIZE=0)
 
 add_executable(test_sequence_512 test_sequence.cpp)
-target_link_libraries(test_sequence_512 boost_unit_test_framework)
+target_link_libraries(test_sequence_512 ${Boost_LIBRARIES})
 set_property(TARGET test_sequence_512 PROPERTY COMPILE_DEFINITIONS
              BOOST_TEST_DYN_LINK TARGET_SIZE=512)
 

test/test_sequence.cpp

@@ -1,14 +1,12 @@
 #define BOOST_TEST_MODULE test_sequence
 
-#include <boost/test/unit_test.hpp>
 #include <boost/segmented_tree/seq.hpp>
-
-#include "../common/single.hpp"
-#include "../common/range.hpp"
-#include "../common/iterator.hpp"
-
+#include <boost/test/unit_test.hpp>
 #include <exception>
 #include <limits>
+#include "../common/iterator.hpp"
+#include "../common/range.hpp"
+#include "../common/single.hpp"
 
 template <typename T, typename Alloc = std::allocator<T>>
 using seq = boost::segmented_tree::seq<T, Alloc, TARGET_SIZE>;