Fix regressed formating

This commit is contained in:
Patrick Niklaus
2016-06-21 16:54:16 +02:00
parent 2592cd2e58
commit fddc19e98d
9 changed files with 30 additions and 26 deletions
@@ -177,7 +177,8 @@ class SharedDataFacade final : public BaseDataFacade
osmnodeid_list_ptr,
data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]);
// We (ab)use the number of coordinates here because we know we have the same amount of ids
m_osmnodeid_list.set_number_of_entries(data_layout->num_entries[storage::SharedDataLayout::COORDINATE_LIST]);
m_osmnodeid_list.set_number_of_entries(
data_layout->num_entries[storage::SharedDataLayout::COORDINATE_LIST]);
auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
shared_memory, storage::SharedDataLayout::TRAVEL_MODE);
+3 -4
View File
@@ -12,7 +12,6 @@ namespace osrm
namespace util
{
/**
* Since OSM node IDs are (at the time of writing) not quite yet overflowing 32 bits, and
* will predictably be containable within 33 bits for a long time, the following packs
@@ -21,16 +20,16 @@ namespace util
* NOTE: this type is templated for future use, but will require a slight refactor to
* configure BITSIZE and ELEMSIZE
*/
template <typename T, bool UseSharedMemory=false> class PackedVector
template <typename T, bool UseSharedMemory = false> class PackedVector
{
static const constexpr std::size_t BITSIZE = 33;
static const constexpr std::size_t ELEMSIZE = 64;
static const constexpr std::size_t PACKSIZE = BITSIZE * ELEMSIZE;
public:
/**
* Returns the size of the packed vector datastructure with `elements` packed elements (the size of
* Returns the size of the packed vector datastructure with `elements` packed elements (the size
* of
* its underlying uint64 vector)
*/
inline static std::size_t elements_to_blocks(std::size_t elements)