Merge 5d475fd into sapling-pr-archive-ktf

Author: ktf

Algorithm/include/Algorithm/BitstreamReader.h

@@ -19,6 +19,8 @@
 
 #include <type_traits>
 #include <bitset>
+#include <utility>
+#include <string>
 
 namespace o2
 {

Algorithm/include/Algorithm/FlattenRestore.h

@@ -18,6 +18,7 @@
 /// @brief  Utilities to copy complex objects to flat buffer and restore
 
 #include <type_traits>
+#include <utility>
 
 namespace o2::algorithm
 {

Algorithm/include/Algorithm/PageParser.h

@@ -22,6 +22,8 @@
 #include <cassert>
 #include <type_traits>
 #include <stdexcept>
+#include <set>
+#include <algorithm>
 
 namespace o2
 {

Algorithm/test/StaticSequenceAllocator.h

@@ -14,6 +14,8 @@
 /// @since  2017-09-21
 /// @brief  An allocator for static sequences of object types
 
+#include <memory>
+
 namespace o2
 {
 namespace algorithm
@@ -145,7 +147,7 @@ struct StaticSequenceAllocator {
   StaticSequenceAllocator() = delete;
 
   template <typename... Targs>
-  StaticSequenceAllocator(Targs... args)
+  explicit StaticSequenceAllocator(Targs... args)
   {
     bufferSize = sequenceLength(args...);
     buffer = std::make_unique<value_type[]>(bufferSize);

Algorithm/test/o2formatparser.cxx

@@ -21,6 +21,7 @@
 #include <iostream>
 #include <iomanip>
 #include <cstring>              // memcmp
+#include <vector>
 #include "Headers/DataHeader.h" // hexdump, DataHeader
 #include "../include/Algorithm/O2FormatParser.h"
 

Algorithm/test/pageparser.cxx

@@ -21,6 +21,8 @@
 #include <iostream>
 #include <iomanip>
 #include <vector>
+#include <memory>
+#include <utility>
 #include "Headers/DataHeader.h" // hexdump
 #include "../include/Algorithm/PageParser.h"
 #include "StaticSequenceAllocator.h"
@@ -29,7 +31,7 @@ struct PageHeader {
   uint32_t magic = 0x45474150;
   uint32_t pageid;
 
-  PageHeader(uint32_t id) : pageid(id) {}
+  explicit PageHeader(uint32_t id) : pageid(id) {}
 };
 
 struct ClusterData {

Algorithm/test/parser.cxx

@@ -29,15 +29,15 @@ struct Header {
   unsigned identifier = 0xdeadbeef;
   size_t payloadSize = 0;
 
-  Header(size_t ps) : payloadSize(ps) {}
+  explicit Header(size_t ps) : payloadSize(ps) {}
 };
 
 // trailer test class
 struct Trailer {
   unsigned identifier = 0xaaffee00;
   unsigned char flags = 0xaa;
 
-  Trailer(unsigned char f) : flags(f) {}
+  explicit Trailer(unsigned char f) : flags(f) {}
 };
 
 // trailer test class including payload size

Algorithm/test/test_BitstreamReader.cxx

@@ -23,6 +23,7 @@
 #include <array>
 #include <vector>
 #include <bitset>
+#include <string>
 #include "../include/Algorithm/BitstreamReader.h"
 
 namespace o2

Algorithm/test/test_FlattenRestore.cxx

@@ -21,6 +21,7 @@
 #include "../include/Algorithm/FlattenRestore.h"
 #include <vector>
 #include <algorithm>
+#include <cstdlib>
 
 namespace flatten = o2::algorithm::flatten;
 
@@ -35,13 +36,14 @@ struct DataAccess {
 } // namespace o2::test
 BOOST_AUTO_TEST_CASE(test_flattenrestore)
 {
-  o2::test::DataAccess access{static_cast<size_t>(rand() % 32)};
+  unsigned int seed = 1;
+  o2::test::DataAccess access{static_cast<size_t>(rand_r(&seed) % 32)};
   std::vector<char> chars(access.count);
-  std::generate(chars.begin(), chars.end(), []() { return rand() % 256; });
+  std::generate(chars.begin(), chars.end(), [&seed]() { return rand_r(&seed) % 256; });
   std::vector<int> ints(access.count);
-  std::generate(ints.begin(), ints.end(), []() { return rand() % 256; });
+  std::generate(ints.begin(), ints.end(), [&seed]() { return rand_r(&seed) % 256; });
   std::vector<float> floats(access.count);
-  std::generate(floats.begin(), floats.end(), []() { return rand() % 256; });
+  std::generate(floats.begin(), floats.end(), [&seed]() { return rand_r(&seed) % 256; });
   access.chars = chars.data();
   access.ints = ints.data();
   access.floats = floats.data();

Algorithm/test/test_RangeTokenizer.cxx

@@ -21,6 +21,8 @@
 #include "../include/Algorithm/RangeTokenizer.h"
 #include <vector>
 #include <map>
+#include <string>
+#include <utility>
 
 using RangeTokenizer = o2::RangeTokenizer;