(svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs.

4 files changed, 6 insertions, 3 deletions

diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp
index 74ade5790..25067ae27 100644
--- a/src/core/pool_type.hpp
+++ b/src/core/pool_type.hpp
@@ -81,6 +81,9 @@ private:
  */
 template <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size, PoolType Tpool_type = PT_NORMAL, bool Tcache = false, bool Tzero = true>
 struct Pool : PoolBase {
+	/* Ensure Tmax_size is within the bounds of Tindex. */
+	assert_compile((Tmax_size - 1) >> 8 * sizeof(Tindex) == 0);
+
 	static const size_t MAX_SIZE = Tmax_size; ///< Make template parameter accessible from outside
 
 	const char * const name; ///< Name of this pool
diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h
index 811a955e5..4bcc27b31 100644
--- a/src/linkgraph/linkgraph.h
+++ b/src/linkgraph/linkgraph.h
@@ -27,7 +27,7 @@ class LinkGraph;
  * Type of the pool for link graph components. Each station can be in at up to
  * 32 link graphs. So we allow for plenty of them to be created.
  */
-typedef Pool<LinkGraph, LinkGraphID, 32, 0xFFFFFF> LinkGraphPool;
+typedef Pool<LinkGraph, LinkGraphID, 32, 0xFFFF> LinkGraphPool;
 /** The actual pool with link graphs. */
 extern LinkGraphPool _link_graph_pool;
 
diff --git a/src/linkgraph/linkgraph_type.h b/src/linkgraph/linkgraph_type.h
index 277e56c73..330461841 100644
--- a/src/linkgraph/linkgraph_type.h
+++ b/src/linkgraph/linkgraph_type.h
@@ -16,7 +16,7 @@ typedef uint16 LinkGraphID;
 static const LinkGraphID INVALID_LINK_GRAPH = UINT16_MAX;
 
 typedef uint16 LinkGraphJobID;
-static const LinkGraphID INVALID_LIN_KGRAPH_JOB = UINT16_MAX;
+static const LinkGraphID INVALID_LINK_GRAPH_JOB = UINT16_MAX;
 
 typedef uint16 NodeID;
 static const NodeID INVALID_NODE = UINT16_MAX;
diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h
index f6979db74..130379220 100644
--- a/src/linkgraph/linkgraphjob.h
+++ b/src/linkgraph/linkgraphjob.h
@@ -21,7 +21,7 @@ class Path;
 typedef std::list<Path *> PathList;
 
 /** Type of the pool for link graph jobs. */
-typedef Pool<LinkGraphJob, LinkGraphJobID, 32, 0xFFFFFF> LinkGraphJobPool;
+typedef Pool<LinkGraphJob, LinkGraphJobID, 32, 0xFFFF> LinkGraphJobPool;
 /** The actual pool with link graph jobs. */
 extern LinkGraphJobPool _link_graph_job_pool;