little merge

b562c56c · Philipp Götze · 2e6302fc · b562c56c · 2e6302fc
Commit b562c56c authored Nov 17, 2017 by Philipp Götze
--- a/src/nvm/BDCCInfo.hpp
+++ b/src/nvm/BDCCInfo.hpp
@@ -26,8 +26,8 @@
 #include <unordered_map>
 #include <algorithm>
 #include <iterator>
-
 #include "nvm/PTableInfo.hpp"
+#include <numeric>

 #include "nvml/include/libpmemobj++/allocator.hpp"
 #include "nvml/include/libpmemobj++/p.hpp"

--- a/src/test/catch.hpp
+++ b/src/test/catch.hpp