Fix formating

This commit is contained in:
Patrick Niklaus
2018-03-28 23:18:28 +00:00
committed by Patrick Niklaus
parent 9fc2c32408
commit 81a4747acb
12 changed files with 80 additions and 81 deletions
+5 -8
View File
@@ -11,9 +11,9 @@
#include "util/version.hpp"
#include <boost/filesystem/fstream.hpp>
#include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/seek.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/iostreams/device/array.hpp>
#include <cerrno>
#include <cstring>
@@ -296,11 +296,10 @@ class FileWriter
class BufferReader
{
public:
BufferReader(const std::string &buffer) : BufferReader(buffer.data(), buffer.size())
{
}
BufferReader(const std::string &buffer) : BufferReader(buffer.data(), buffer.size()) {}
BufferReader(const char* buffer, const std::size_t size) : input_stream(boost::iostreams::array_source(buffer, size))
BufferReader(const char *buffer, const std::size_t size)
: input_stream(boost::iostreams::array_source(buffer, size))
{
if (!input_stream)
{
@@ -309,9 +308,7 @@ class BufferReader
}
}
std::size_t GetPosition() {
return input_stream.tellg();
}
std::size_t GetPosition() { return input_stream.tellg(); }
template <typename T> void ReadInto(T *dest, const std::size_t count)
{
+5 -16
View File
@@ -6,8 +6,8 @@
#include "util/vector_view.hpp"
#include "storage/io.hpp"
#include "storage/tar.hpp"
#include "storage/shared_datatype.hpp"
#include "storage/tar.hpp"
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_input_iterator.hpp>
@@ -92,7 +92,6 @@ void writeBoolVector(tar::FileWriter &writer, const std::string &name, const Vec
}
}
/* All vector formats here use the same on-disk format.
* This is important because we want to be able to write from a vector
* of one kind, but read it into a vector of another kind.
@@ -149,17 +148,12 @@ template <typename T> void write(io::BufferWriter &writer, const std::vector<T>
writer.WriteFrom(data.data(), count);
}
template<typename T>
inline void write(io::BufferWriter &writer, const T &data)
template <typename T> inline void write(io::BufferWriter &writer, const T &data)
{
writer.WriteFrom(data);
}
template<typename T>
inline void read(io::BufferReader &reader, T &data)
{
reader.ReadInto(data);
}
template <typename T> inline void read(io::BufferReader &reader, T &data) { reader.ReadInto(data); }
inline void write(io::BufferWriter &writer, const std::string &data)
{
@@ -254,7 +248,7 @@ template <typename K, typename V> void read(io::BufferReader &reader, std::map<K
std::pair<K, V> pair;
for (auto index : util::irange<std::size_t>(0, count))
{
(void) index;
(void)index;
read(reader, pair.first);
read(reader, pair.second);
data.insert(pair);
@@ -272,17 +266,12 @@ template <typename K, typename V> void write(io::BufferWriter &writer, const std
}
}
inline void read(io::BufferReader &reader, DataLayout &layout)
{
read(reader, layout.blocks);
}
inline void read(io::BufferReader &reader, DataLayout &layout) { read(reader, layout.blocks); }
inline void write(io::BufferWriter &writer, const DataLayout &layout)
{
write(writer, layout.blocks);
}
}
}
}
+4 -1
View File
@@ -71,7 +71,10 @@ class DataLayout
inline uint64_t GetBlockSize(const std::string &name) const { return GetBlock(name).byte_size; }
inline bool HasBlock(const std::string &name) const { return blocks.find(name) != blocks.end(); }
inline bool HasBlock(const std::string &name) const
{
return blocks.find(name) != blocks.end();
}
inline uint64_t GetSizeOfLayout() const
{