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

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
+9 -9
View File
@@ -137,7 +137,7 @@ class Contractor
{
explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}
ContractorThreadData* getThreadData()
inline ContractorThreadData* getThreadData()
{
bool exists = false;
auto& ref = data.local(exists);
@@ -551,7 +551,7 @@ class Contractor
thread_data_list.data.clear();
}
template <class Edge> void GetEdges(DeallocatingVector<Edge> &edges)
template <class Edge> inline void GetEdges(DeallocatingVector<Edge> &edges)
{
Percent p(contractor_graph->GetNumberOfNodes());
SimpleLogger().Write() << "Getting edges of minimized graph";
@@ -607,7 +607,7 @@ class Contractor
}
private:
void Dijkstra(const int max_distance,
inline void Dijkstra(const int max_distance,
const unsigned number_of_targets,
const int maxNodes,
ContractorThreadData *const data,
@@ -673,7 +673,7 @@ class Contractor
}
}
float EvaluateNodePriority(ContractorThreadData *const data,
inline float EvaluateNodePriority(ContractorThreadData *const data,
NodePriorityData *const node_data,
const NodeID node)
{
@@ -700,7 +700,7 @@ class Contractor
}
template <bool RUNSIMULATION>
bool
inline bool
ContractNode(ContractorThreadData *data, const NodeID node, ContractionStats *stats = nullptr)
{
ContractorHeap &heap = data->heap;
@@ -829,7 +829,7 @@ class Contractor
return true;
}
void DeleteIncomingEdges(ContractorThreadData *data, const NodeID node)
inline void DeleteIncomingEdges(ContractorThreadData *data, const NodeID node)
{
std::vector<NodeID> &neighbours = data->neighbours;
neighbours.clear();
@@ -853,7 +853,7 @@ class Contractor
}
}
bool UpdateNodeNeighbours(std::vector<float> &priorities,
inline bool UpdateNodeNeighbours(std::vector<float> &priorities,
std::vector<NodePriorityData> &node_data,
ContractorThreadData *const data,
const NodeID node)
@@ -884,7 +884,7 @@ class Contractor
return true;
}
bool IsNodeIndependent(
inline bool IsNodeIndependent(
const std::vector<float> &priorities,
ContractorThreadData *const data,
NodeID node) const
@@ -949,7 +949,7 @@ class Contractor
}
// This bias function takes up 22 assembly instructions in total on X86
bool bias(const NodeID a, const NodeID b) const
inline bool bias(const NodeID a, const NodeID b) const
{
const unsigned short hasha = fast_hash(a);
const unsigned short hashb = fast_hash(b);