Package: spring / 106.0+dfsg-4

jsoncpp.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
From: Markus Koschany <apo@debian.org>
Date: Sat, 24 Sep 2022 21:31:44 +0200
Subject: jsoncpp

---
 AI/Skirmish/CircuitAI/src/circuit/map/InfluenceMap.cpp        | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/map/ThreatMap.cpp           | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp   | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp   | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp   | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp  | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp     | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/setup/DefenceMatrix.cpp     | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp      | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h        | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp  | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp        | 2 +-
 AI/Skirmish/CircuitAI/src/circuit/unit/enemy/EnemyManager.cpp | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/AI/Skirmish/CircuitAI/src/circuit/map/InfluenceMap.cpp b/AI/Skirmish/CircuitAI/src/circuit/map/InfluenceMap.cpp
index c8278fa..be7f67b 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/map/InfluenceMap.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/map/InfluenceMap.cpp
@@ -14,7 +14,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringCallback.h"
 
diff --git a/AI/Skirmish/CircuitAI/src/circuit/map/ThreatMap.cpp b/AI/Skirmish/CircuitAI/src/circuit/map/ThreatMap.cpp
index 7520e4b..333c89b 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/map/ThreatMap.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/map/ThreatMap.cpp
@@ -13,7 +13,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #ifdef DEBUG_VIS
 #include "Lua.h"
diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp
index 114e139..f25c3ec 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp
@@ -42,7 +42,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "Command.h"
 #include "Log.h"
diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp
index 6be5aa1..0663051 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp
@@ -17,7 +17,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringCallback.h"
 #include "spring/SpringMap.h"
diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp
index c274e06..193aa99 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp
@@ -21,7 +21,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringCallback.h"
 
diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp
index 3057113..bbc78e1 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp
@@ -37,7 +37,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringCallback.h"
 #include "spring/SpringMap.h"
diff --git a/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp b/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp
index 358db03..c132738 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp
@@ -14,7 +14,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 #include "lemon/kruskal.h"
 
 #include "spring/SpringMap.h"
diff --git a/AI/Skirmish/CircuitAI/src/circuit/setup/DefenceMatrix.cpp b/AI/Skirmish/CircuitAI/src/circuit/setup/DefenceMatrix.cpp
index 6f4804b..6cb4f80 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/setup/DefenceMatrix.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/setup/DefenceMatrix.cpp
@@ -16,7 +16,7 @@
 #include "util/math/EncloseCircle.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringMap.h"
 
diff --git a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp
index eaa2145..2c6fa8a 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp
@@ -15,7 +15,7 @@
 #include "util/Scheduler.h"
 #include "util/FileSystem.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringCallback.h"
 #include "spring/SpringMap.h"
diff --git a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h
index 6daf3e7..2c85b06 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h
+++ b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h
@@ -9,7 +9,7 @@
 #define SRC_CIRCUIT_STATIC_SETUPMANAGER_H_
 
 #include "unit/CircuitDef.h"
-#include "json/json-forwards.h"
+#include <jsoncpp/json/forwards.h>
 
 #include "AIFloat3.h"
 
diff --git a/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp
index 20ff93b..616e5b6 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp
@@ -17,7 +17,7 @@
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringMap.h"
 
diff --git a/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp b/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp
index 8b984a9..0b765ae 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp
@@ -11,7 +11,7 @@
 #include "terrain/TerrainManager.h"
 #include "CircuitAI.h"
 #include "util/Utils.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 
 #include "spring/SpringMap.h"
 
diff --git a/AI/Skirmish/CircuitAI/src/circuit/unit/enemy/EnemyManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/unit/enemy/EnemyManager.cpp
index 64358ff..29f997c 100644
--- a/AI/Skirmish/CircuitAI/src/circuit/unit/enemy/EnemyManager.cpp
+++ b/AI/Skirmish/CircuitAI/src/circuit/unit/enemy/EnemyManager.cpp
@@ -15,7 +15,7 @@
 #include "terrain/TerrainManager.h"
 #include "CircuitAI.h"
 #include "util/Scheduler.h"
-#include "json/json.h"
+#include <jsoncpp/json/json.h>
 #include "util/Utils.h"
 
 #include "spring/SpringCallback.h"