summaryrefslogtreecommitdiff
path: root/src/linkgraph
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-04-23 20:13:33 +0000
committerrubidium <rubidium@openttd.org>2014-04-23 20:13:33 +0000
commit0463dbdc9e5b39399765015c394e29dedaf7d041 (patch)
tree0d115f2027997f6c452d59d63919f9a6d05cb8be /src/linkgraph
parent287ecd158249628a9b12aa5567e0e188499084f5 (diff)
downloadopenttd-0463dbdc9e5b39399765015c394e29dedaf7d041.tar.xz
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
Diffstat (limited to 'src/linkgraph')
-rw-r--r--src/linkgraph/demands.cpp2
-rw-r--r--src/linkgraph/flowmapper.cpp2
-rw-r--r--src/linkgraph/linkgraph.cpp2
-rw-r--r--src/linkgraph/linkgraph_gui.cpp2
-rw-r--r--src/linkgraph/linkgraphjob.cpp2
-rw-r--r--src/linkgraph/linkgraphschedule.cpp2
-rw-r--r--src/linkgraph/mcf.cpp2
-rw-r--r--src/linkgraph/refresh.cpp2
8 files changed, 16 insertions, 0 deletions
diff --git a/src/linkgraph/demands.cpp b/src/linkgraph/demands.cpp
index 80a0f5677..84c73f733 100644
--- a/src/linkgraph/demands.cpp
+++ b/src/linkgraph/demands.cpp
@@ -4,6 +4,8 @@
#include "demands.h"
#include <list>
+#include "../safeguards.h"
+
typedef std::list<NodeID> NodeList;
/**
diff --git a/src/linkgraph/flowmapper.cpp b/src/linkgraph/flowmapper.cpp
index 3daab4414..4b974a809 100644
--- a/src/linkgraph/flowmapper.cpp
+++ b/src/linkgraph/flowmapper.cpp
@@ -12,6 +12,8 @@
#include "../stdafx.h"
#include "flowmapper.h"
+#include "../safeguards.h"
+
/**
* Map the paths generated by the MCF solver into flows associated with nodes.
* @param component the link graph component to be used.
diff --git a/src/linkgraph/linkgraph.cpp b/src/linkgraph/linkgraph.cpp
index d41c3494d..461b3b47e 100644
--- a/src/linkgraph/linkgraph.cpp
+++ b/src/linkgraph/linkgraph.cpp
@@ -13,6 +13,8 @@
#include "../core/pool_func.hpp"
#include "linkgraph.h"
+#include "../safeguards.h"
+
/* Initialize the link-graph-pool */
LinkGraphPool _link_graph_pool("LinkGraph");
INSTANTIATE_POOL_METHODS(LinkGraph)
diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp
index f75f602ab..579bf9c46 100644
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -22,6 +22,8 @@
#include "table/strings.h"
+#include "../safeguards.h"
+
/**
* Colours for the various "load" states of links. Ordered from "unused" to
* "overloaded".
diff --git a/src/linkgraph/linkgraphjob.cpp b/src/linkgraph/linkgraphjob.cpp
index 61e313616..30d68e4d8 100644
--- a/src/linkgraph/linkgraphjob.cpp
+++ b/src/linkgraph/linkgraphjob.cpp
@@ -15,6 +15,8 @@
#include "linkgraphjob.h"
#include "linkgraphschedule.h"
+#include "../safeguards.h"
+
/* Initialize the link-graph-job-pool */
LinkGraphJobPool _link_graph_job_pool("LinkGraphJob");
INSTANTIATE_POOL_METHODS(LinkGraphJob)
diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp
index 4e6f33266..30ad20d4d 100644
--- a/src/linkgraph/linkgraphschedule.cpp
+++ b/src/linkgraph/linkgraphschedule.cpp
@@ -16,6 +16,8 @@
#include "mcf.h"
#include "flowmapper.h"
+#include "../safeguards.h"
+
/**
* Start the next job in the schedule.
*/
diff --git a/src/linkgraph/mcf.cpp b/src/linkgraph/mcf.cpp
index af9f6ce5f..3163ec9e3 100644
--- a/src/linkgraph/mcf.cpp
+++ b/src/linkgraph/mcf.cpp
@@ -5,6 +5,8 @@
#include "mcf.h"
#include <set>
+#include "../safeguards.h"
+
typedef std::map<NodeID, Path *> PathViaMap;
/**
diff --git a/src/linkgraph/refresh.cpp b/src/linkgraph/refresh.cpp
index 921f5d7b8..8c45cad8b 100644
--- a/src/linkgraph/refresh.cpp
+++ b/src/linkgraph/refresh.cpp
@@ -17,6 +17,8 @@
#include "refresh.h"
#include "linkgraph.h"
+#include "../safeguards.h"
+
/**
* Refresh all links the given vehicle will visit.
* @param v Vehicle to refresh links for.