Replace Count32 with Count64

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
+2 -2
View File
@@ -366,7 +366,7 @@ void Storage::PopulateLayout(DataLayout &layout)
layout.SetBlockSize<BearingClassID>(DataLayout::BEARING_CLASSID,
bearing_class_id_table.size());
const auto bearing_blocks = intersection_file.ReadElementCount32();
const auto bearing_blocks = intersection_file.ReadElementCount64();
intersection_file.Skip<std::uint32_t>(1); // sum_lengths
layout.SetBlockSize<unsigned>(DataLayout::BEARING_OFFSETS, bearing_blocks);
@@ -793,7 +793,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
std::vector<BearingClassID> bearing_class_id_table;
serialization::read(intersection_file, bearing_class_id_table);
const auto bearing_blocks = intersection_file.ReadElementCount32();
const auto bearing_blocks = intersection_file.ReadElementCount64();
intersection_file.Skip<std::uint32_t>(1); // sum_lengths
std::vector<unsigned> bearing_offsets_data(bearing_blocks);