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

To arrive at a later point in time: Revert "remove inline keywords"

Browse Source 
This reverts commit 81b0447024.
This commit is contained in:
Dennis Luxen
2014-10-21 18:34:50 +02:00
parent 81b0447024
commit 511c21029e
26 changed files with 115 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/DataStructures/SharedDataType.h
+5 -5
View File
@@ -111,13 +111,13 @@ struct SharedDataLayout
}
template<typename T>
void SetBlockSize(BlockID bid, uint64_t entries)
inline void SetBlockSize(BlockID bid, uint64_t entries)
{
num_entries[bid] = entries;
entry_size[bid] = sizeof(T);
}
uint64_t GetBlockSize(BlockID bid) const
inline uint64_t GetBlockSize(BlockID bid) const
{
// special encoding
if (bid == GEOMETRIES_INDICATORS)
@@ -128,12 +128,12 @@ struct SharedDataLayout
return num_entries[bid] * entry_size[bid];
}
uint64_t GetSizeOfLayout() const
inline uint64_t GetSizeOfLayout() const
{
return GetBlockOffset(NUM_BLOCKS) + NUM_BLOCKS*2*sizeof(CANARY);
}
uint64_t GetBlockOffset(BlockID bid) const
inline uint64_t GetBlockOffset(BlockID bid) const
{
uint64_t result = sizeof(CANARY);
for (auto i = 0; i < bid; i++)
@@ -144,7 +144,7 @@ struct SharedDataLayout
}
template<typename T, bool WRITE_CANARY=false>
T* GetBlockPtr(char* shared_memory, BlockID bid)
inline T* GetBlockPtr(char* shared_memory, BlockID bid)
{
T* ptr = (T*)(shared_memory + GetBlockOffset(bid));
if (WRITE_CANARY)