Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Replace Count32 with Count64

Browse Source
This commit is contained in:
Pepijn Schoen
2017-04-08 16:06:34 +02:00
committed by Patrick Niklaus
parent 0c388a5264
commit b830a8f942
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/storage/io.hpp
-2
View File
@@ -126,7 +126,6 @@ class FileReader
/*******************************************/
std::uint32_t ReadElementCount32() { return ReadOne<std::uint32_t>(); }
std::uint64_t ReadElementCount64() { return ReadOne<std::uint64_t>(); }
template <typename T> std::size_t ReadVectorSize()
@@ -228,7 +227,6 @@ class FileWriter
template <typename T> void WriteOne(const T tmp) { WriteFrom(tmp); }
void WriteElementCount32(const std::uint32_t count) { WriteOne<std::uint32_t>(count); }
void WriteElementCount64(const std::uint64_t count) { WriteOne<std::uint64_t>(count); }
void WriteFingerprint()
include/util/graph_loader.hpp
+3 -4
View File
@@ -38,7 +38,7 @@ namespace util
inline unsigned loadRestrictionsFromFile(storage::io::FileReader &file_reader,
std::vector<extractor::TurnRestriction> &restriction_list)
{
unsigned number_of_usable_restrictions = file_reader.ReadElementCount32();
auto number_of_usable_restrictions = file_reader.ReadElementCount64();
restriction_list.resize(number_of_usable_restrictions);
if (number_of_usable_restrictions > 0)
{
@@ -61,7 +61,7 @@ NodeID loadNodesFromFile(storage::io::FileReader &file_reader,
std::vector<util::Coordinate> &coordinates,
util::PackedVector<OSMNodeID> &osm_node_ids)
{
NodeID number_of_nodes = file_reader.ReadElementCount32();
auto number_of_nodes = file_reader.ReadElementCount64();
Log() << "Importing number_of_nodes new = " << number_of_nodes << " nodes ";
coordinates.resize(number_of_nodes);
@@ -98,8 +98,7 @@ NodeID loadNodesFromFile(storage::io::FileReader &file_reader,
inline NodeID loadEdgesFromFile(storage::io::FileReader &file_reader,
std::vector<extractor::NodeBasedEdge> &edge_list)
{
EdgeID number_of_edges = file_reader.ReadElementCount32();
BOOST_ASSERT(sizeof(EdgeID) == sizeof(number_of_edges));
auto number_of_edges = file_reader.ReadElementCount64();
edge_list.resize(number_of_edges);
Log() << " and " << number_of_edges << " edges ";
include/util/range_table.hpp
+3 -3
View File
@@ -143,9 +143,9 @@ template <unsigned BLOCK_SIZE, storage::Ownership Ownership> class RangeTable
void Write(storage::io::FileWriter &filewriter)
{
unsigned number_of_blocks = diff_blocks.size();
auto number_of_blocks = diff_blocks.size();
filewriter.WriteElementCount32(number_of_blocks);
filewriter.WriteElementCount64(number_of_blocks);
filewriter.WriteOne(sum_lengths);
@@ -155,7 +155,7 @@ template <unsigned BLOCK_SIZE, storage::Ownership Ownership> class RangeTable
void Read(storage::io::FileReader &filereader)
{
unsigned number_of_blocks = filereader.ReadElementCount32();
auto number_of_blocks = filereader.ReadElementCount64();
// read total length
filereader.ReadInto(&sum_lengths, 1);