Fix formating

This commit is contained in:
Patrick Niklaus 2017-04-10 08:35:52 +00:00 committed by Patrick Niklaus
parent 59bbfeb67f
commit da474a16a9
2 changed files with 6 additions and 4 deletions

View File

@ -1,8 +1,8 @@
#ifndef OSRM_STORAGE_SERIALIZATION_HPP #ifndef OSRM_STORAGE_SERIALIZATION_HPP
#define OSRM_STORAGE_SERIALIZATION_HPP #define OSRM_STORAGE_SERIALIZATION_HPP
#include "util/vector_view.hpp"
#include "util/integer_range.hpp" #include "util/integer_range.hpp"
#include "util/vector_view.hpp"
#include "storage/io.hpp" #include "storage/io.hpp"
@ -14,8 +14,7 @@ namespace storage
{ {
namespace serialization namespace serialization
{ {
template <typename T> template <typename T> inline void read(storage::io::FileReader &reader, stxxl::vector<T> &vec)
inline void read(storage::io::FileReader &reader, stxxl::vector<T> &vec)
{ {
auto size = reader.ReadOne<std::uint64_t>(); auto size = reader.ReadOne<std::uint64_t>();
vec.reserve(size); vec.reserve(size);

View File

@ -177,7 +177,10 @@ template <typename DataT> void swap(vector_view<DataT> &lhs, vector_view<DataT>
} }
template <typename DataT, storage::Ownership Ownership> template <typename DataT, storage::Ownership Ownership>
using InternalOrExternalVector = typename std::conditional<Ownership == storage::Ownership::External, stxxl::vector<DataT>, std::vector<DataT>>::type; using InternalOrExternalVector =
typename std::conditional<Ownership == storage::Ownership::External,
stxxl::vector<DataT>,
std::vector<DataT>>::type;
template <typename DataT, storage::Ownership Ownership> template <typename DataT, storage::Ownership Ownership>
using ViewOrVector = typename std::conditional<Ownership == storage::Ownership::View, using ViewOrVector = typename std::conditional<Ownership == storage::Ownership::View,