Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 2ed41d784fd49da488c82bd988d67262eed4480f / . / meta-openembedded / meta-oe / recipes-support / websocketpp / websocketpp-0.8.2 / 1024.patch
blob: 12613f8b19bfe7c39895265e2590ab65a3aead0b [file] [log] [blame]
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]1From 05d1189ffce562560da90056d96fe2084d84654a Mon Sep 17 00:00:00 2001
2From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org>
3Date: Mon, 14 Feb 2022 14:13:13 +0100
4Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11
5 as an array.
6
7This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022
8---
Patrick Williams520786c2023-06-25 16:20:36 -0500[diff] [blame]9Upstream-Status: Pending
10
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]11 examples/broadcast_server/SConscript | 2 +-
12 examples/debug_client/SConscript | 2 +-
13 examples/debug_server/SConscript | 2 +-
14 examples/dev/SConscript | 2 +-
15 examples/echo_client/SConscript | 2 +-
16 examples/echo_server/SConscript | 2 +-
17 examples/echo_server_both/SConscript | 2 +-
18 examples/echo_server_tls/SConscript | 2 +-
19 examples/external_io_service/SConscript | 2 +-
20 examples/iostream_server/SConscript | 2 +-
21 examples/print_client/SConscript | 2 +-
22 examples/print_client_tls/SConscript | 2 +-
23 examples/print_server/SConscript | 2 +-
24 examples/scratch_client/SConscript | 2 +-
25 examples/scratch_server/SConscript | 2 +-
26 examples/sip_client/SConscript | 2 +-
27 examples/subprotocol_server/SConscript | 2 +-
28 examples/telemetry_client/SConscript | 2 +-
29 examples/telemetry_server/SConscript | 2 +-
30 examples/testee_client/SConscript | 2 +-
31 examples/testee_server/SConscript | 2 +-
32 examples/utility_client/SConscript | 4 ++--
33 test/connection/SConscript | 2 +-
34 test/endpoint/SConscript | 2 +-
35 test/extension/SConscript | 2 +-
36 test/http/SConscript | 2 +-
37 test/logger/SConscript | 2 +-
38 test/message_buffer/SConscript | 2 +-
39 test/processors/SConscript | 2 +-
40 test/random/SConscript | 2 +-
41 test/roles/SConscript | 2 +-
42 test/transport/SConscript | 2 +-
43 test/transport/asio/SConscript | 2 +-
44 test/transport/iostream/SConscript | 2 +-
45 test/utility/SConscript | 2 +-
46 35 files changed, 36 insertions(+), 36 deletions(-)
47
48diff --git a/examples/broadcast_server/SConscript b/examples/broadcast_server/SConscript
49index 5786f570d..06c55c147 100644
50--- a/examples/broadcast_server/SConscript
51+++ b/examples/broadcast_server/SConscript
52@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
53 prgs = []
54
55 # if a C++11 environment is available build using that, otherwise use boost
56-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
57+if 'WSPP_CPP11_ENABLED' in env_cpp11:
58 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
59 prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
60 else:
61diff --git a/examples/debug_client/SConscript b/examples/debug_client/SConscript
62index 781db8371..b92b14653 100644
63--- a/examples/debug_client/SConscript
64+++ b/examples/debug_client/SConscript
65@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
66 prgs = []
67
68 # if a C++11 environment is available build using that, otherwise use boost
69-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
70+if 'WSPP_CPP11_ENABLED' in env_cpp11:
71 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
72 prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
73 else:
74diff --git a/examples/debug_server/SConscript b/examples/debug_server/SConscript
75index 4d02261c6..7e24b07c8 100644
76--- a/examples/debug_server/SConscript
77+++ b/examples/debug_server/SConscript
78@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
79 prgs = []
80
81 # if a C++11 environment is available build using that, otherwise use boost
82-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
83+if 'WSPP_CPP11_ENABLED' in env_cpp11:
84 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
85 prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
86 else:
87diff --git a/examples/dev/SConscript b/examples/dev/SConscript
88index 34ddac2d5..31062fee9 100644
89--- a/examples/dev/SConscript
90+++ b/examples/dev/SConscript
91@@ -11,7 +11,7 @@ env_cpp11 = env_cpp11.Clone ()
92
93 prgs = []
94
95-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
96+if 'WSPP_CPP11_ENABLED' in env_cpp11:
97 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs]
98 prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11)
99
100diff --git a/examples/echo_client/SConscript b/examples/echo_client/SConscript
101index 0e4110822..2adf1166d 100644
102--- a/examples/echo_client/SConscript
103+++ b/examples/echo_client/SConscript
104@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
105 prgs = []
106
107 # if a C++11 environment is available build using that, otherwise use boost
108-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
109+if 'WSPP_CPP11_ENABLED' in env_cpp11:
110 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
111 prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
112 else:
113diff --git a/examples/echo_server/SConscript b/examples/echo_server/SConscript
114index a2978852e..a48724155 100644
115--- a/examples/echo_server/SConscript
116+++ b/examples/echo_server/SConscript
117@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
118 prgs = []
119
120 # if a C++11 environment is available build using that, otherwise use boost
121-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
122+if 'WSPP_CPP11_ENABLED' in env_cpp11:
123 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
124 prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
125 else:
126diff --git a/examples/echo_server_both/SConscript b/examples/echo_server_both/SConscript
127index d1ecf202f..32f4c8c55 100644
128--- a/examples/echo_server_both/SConscript
129+++ b/examples/echo_server_both/SConscript
130@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
131 prgs = []
132
133 # if a C++11 environment is available build using that, otherwise use boost
134-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
135+if 'WSPP_CPP11_ENABLED' in env_cpp11:
136 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
137 prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS)
138 else:
139diff --git a/examples/echo_server_tls/SConscript b/examples/echo_server_tls/SConscript
140index e24cc4ce8..688bf7c14 100644
141--- a/examples/echo_server_tls/SConscript
142+++ b/examples/echo_server_tls/SConscript
143@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
144 prgs = []
145
146 # if a C++11 environment is available build using that, otherwise use boost
147-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
148+if 'WSPP_CPP11_ENABLED' in env_cpp11:
149 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
150 prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
151 else:
152diff --git a/examples/external_io_service/SConscript b/examples/external_io_service/SConscript
153index beb7c1c42..0abf3e175 100644
154--- a/examples/external_io_service/SConscript
155+++ b/examples/external_io_service/SConscript
156@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
157 prgs = []
158
159 # if a C++11 environment is available build using that, otherwise use boost
160-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
161+if 'WSPP_CPP11_ENABLED' in env_cpp11:
162 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
163 prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS)
164 else:
165diff --git a/examples/iostream_server/SConscript b/examples/iostream_server/SConscript
166index dc90834cf..304142082 100644
167--- a/examples/iostream_server/SConscript
168+++ b/examples/iostream_server/SConscript
169@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
170 prgs = []
171
172 # if a C++11 environment is available build using that, otherwise use boost
173-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
174+if 'WSPP_CPP11_ENABLED' in env_cpp11:
175 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
176 prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
177 else:
178diff --git a/examples/print_client/SConscript b/examples/print_client/SConscript
179index 8da4ce5b2..79fdea0fd 100644
180--- a/examples/print_client/SConscript
181+++ b/examples/print_client/SConscript
182@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
183 prgs = []
184
185 # if a C++11 environment is available build using that, otherwise use boost
186-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
187+if 'WSPP_CPP11_ENABLED' in env_cpp11:
188 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
189 prgs += env_cpp11.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS)
190 else:
191diff --git a/examples/print_client_tls/SConscript b/examples/print_client_tls/SConscript
192index 01b011473..e57b9d691 100644
193--- a/examples/print_client_tls/SConscript
194+++ b/examples/print_client_tls/SConscript
195@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
196 prgs = []
197
198 # if a C++11 environment is available build using that, otherwise use boost
199-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
200+if 'WSPP_CPP11_ENABLED' in env_cpp11:
201 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
202 prgs += env_cpp11.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS)
203 else:
204diff --git a/examples/print_server/SConscript b/examples/print_server/SConscript
205index 4f0e492be..454dcf01b 100644
206--- a/examples/print_server/SConscript
207+++ b/examples/print_server/SConscript
208@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
209 prgs = []
210
211 # if a C++11 environment is available build using that, otherwise use boost
212-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
213+if 'WSPP_CPP11_ENABLED' in env_cpp11:
214 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
215 prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
216 else:
217diff --git a/examples/scratch_client/SConscript b/examples/scratch_client/SConscript
218index 6e7b2ef07..4be98f437 100644
219--- a/examples/scratch_client/SConscript
220+++ b/examples/scratch_client/SConscript
221@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
222 prgs = []
223
224 # if a C++11 environment is available build using that, otherwise use boost
225-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
226+if 'WSPP_CPP11_ENABLED' in env_cpp11:
227 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
228 prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
229 else:
230diff --git a/examples/scratch_server/SConscript b/examples/scratch_server/SConscript
231index bf90f7433..cc495ba5c 100644
232--- a/examples/scratch_server/SConscript
233+++ b/examples/scratch_server/SConscript
234@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone ()
235 prgs = []
236
237 # if a C++11 environment is available build using that, otherwise use boost
238-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
239+if 'WSPP_CPP11_ENABLED' in env_cpp11:
240 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
241 prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
242 else:
243diff --git a/examples/sip_client/SConscript b/examples/sip_client/SConscript
244index fafe7b4ff..e2afefe73 100644
245--- a/examples/sip_client/SConscript
246+++ b/examples/sip_client/SConscript
247@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
248 prgs = []
249
250 # if a C++11 environment is available build using that, otherwise use boost
251-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
252+if 'WSPP_CPP11_ENABLED' in env_cpp11:
253 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
254 prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
255 else:
256diff --git a/examples/subprotocol_server/SConscript b/examples/subprotocol_server/SConscript
257index e97535ca5..299af43c5 100644
258--- a/examples/subprotocol_server/SConscript
259+++ b/examples/subprotocol_server/SConscript
260@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
261 prgs = []
262
263 # if a C++11 environment is available build using that, otherwise use boost
264-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
265+if 'WSPP_CPP11_ENABLED' in env_cpp11:
266 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
267 prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
268 else:
269diff --git a/examples/telemetry_client/SConscript b/examples/telemetry_client/SConscript
270index 62396a5e3..ac0e6daba 100644
271--- a/examples/telemetry_client/SConscript
272+++ b/examples/telemetry_client/SConscript
273@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
274 prgs = []
275
276 # if a C++11 environment is available build using that, otherwise use boost
277-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
278+if 'WSPP_CPP11_ENABLED' in env_cpp11:
279 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
280 prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
281 else:
282diff --git a/examples/telemetry_server/SConscript b/examples/telemetry_server/SConscript
283index 1b8ff2295..c620f38a4 100644
284--- a/examples/telemetry_server/SConscript
285+++ b/examples/telemetry_server/SConscript
286@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
287 prgs = []
288
289 # if a C++11 environment is available build using that, otherwise use boost
290-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
291+if 'WSPP_CPP11_ENABLED' in env_cpp11:
292 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
293 prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS)
294 else:
295diff --git a/examples/testee_client/SConscript b/examples/testee_client/SConscript
296index 64f0ef1f3..6154bb966 100644
297--- a/examples/testee_client/SConscript
298+++ b/examples/testee_client/SConscript
299@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
300 prgs = []
301
302 # if a C++11 environment is available build using that, otherwise use boost
303-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
304+if 'WSPP_CPP11_ENABLED' in env_cpp11:
305 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
306 prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
307 else:
308diff --git a/examples/testee_server/SConscript b/examples/testee_server/SConscript
309index 3c75f4ff2..ca8ffb7d7 100644
310--- a/examples/testee_server/SConscript
311+++ b/examples/testee_server/SConscript
312@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone ()
313 prgs = []
314
315 # if a C++11 environment is available build using that, otherwise use boost
316-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
317+if 'WSPP_CPP11_ENABLED' in env_cpp11:
318 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
319 prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
320 else:
321diff --git a/examples/utility_client/SConscript b/examples/utility_client/SConscript
322index 6e6cd8c9d..f6d673a43 100644
323--- a/examples/utility_client/SConscript
324+++ b/examples/utility_client/SConscript
325@@ -13,11 +13,11 @@ env_cpp11 = env_cpp11.Clone ()
326 prgs = []
327
328 # if a C++11 environment is available build using that, otherwise use boost
329-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
330+if 'WSPP_CPP11_ENABLED' in env_cpp11:
331 ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
332 prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
333 else:
334 ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
335 prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
336
337-Return('prgs')
338\ No newline at end of file
339+Return('prgs')
340diff --git a/test/connection/SConscript b/test/connection/SConscript
341index 4ed7a4e69..b79876bf1 100644
342--- a/test/connection/SConscript
343+++ b/test/connection/SConscript
344@@ -16,7 +16,7 @@ objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS)
345 objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS)
346 prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS)
347
348-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
349+if 'WSPP_CPP11_ENABLED' in env_cpp11:
350 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
351 objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11)
352 objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11)
353diff --git a/test/endpoint/SConscript b/test/endpoint/SConscript
354index 5cb3ede91..74912865e 100644
355--- a/test/endpoint/SConscript
356+++ b/test/endpoint/SConscript
357@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] +
358 objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS)
359 prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS)
360
361-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
362+if 'WSPP_CPP11_ENABLED' in env_cpp11:
363 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
364 objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11)
365 prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11)
366diff --git a/test/extension/SConscript b/test/extension/SConscript
367index d8b425fda..0cb813856 100644
368--- a/test/extension/SConscript
369+++ b/test/extension/SConscript
370@@ -17,7 +17,7 @@ objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIB
371 prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS)
372 prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS)
373
374-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
375+if 'WSPP_CPP11_ENABLED' in env_cpp11:
376 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
377 objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11)
378 objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11)
379diff --git a/test/http/SConscript b/test/http/SConscript
380index 0a24a8774..422998e24 100644
381--- a/test/http/SConscript
382+++ b/test/http/SConscript
383@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs]
384 objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS)
385 prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS)
386
387-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
388+if 'WSPP_CPP11_ENABLED' in env_cpp11:
389 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
390 objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11)
391 prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11)
392diff --git a/test/logger/SConscript b/test/logger/SConscript
393index 81d607601..0ccbbc5df 100644
394--- a/test/logger/SConscript
395+++ b/test/logger/SConscript
396@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
397 objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS)
398 prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS)
399
400-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
401+if 'WSPP_CPP11_ENABLED' in env_cpp11:
402 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
403 objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11)
404 prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11)
405diff --git a/test/message_buffer/SConscript b/test/message_buffer/SConscript
406index 2ef6d71f3..89785cb3e 100644
407--- a/test/message_buffer/SConscript
408+++ b/test/message_buffer/SConscript
409@@ -17,7 +17,7 @@ objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS)
410 prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS)
411 prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS)
412
413-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
414+if 'WSPP_CPP11_ENABLED' in env_cpp11:
415 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
416 objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11)
417 objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11)
418diff --git a/test/processors/SConscript b/test/processors/SConscript
419index 406a7edc9..1b40d0b1d 100644
420--- a/test/processors/SConscript
421+++ b/test/processors/SConscript
422@@ -26,7 +26,7 @@ prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_L
423 prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS)
424 prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z'])
425
426-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
427+if 'WSPP_CPP11_ENABLED' in env_cpp11:
428 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
429 # no C++11 features are used in processor so there are no C++11 versions of
430 # these tests.
431diff --git a/test/random/SConscript b/test/random/SConscript
432index 3cadc9e97..4a11b0ce5 100644
433--- a/test/random/SConscript
434+++ b/test/random/SConscript
435@@ -17,7 +17,7 @@ objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_
436 prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS)
437 prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS)
438
439-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
440+if 'WSPP_CPP11_ENABLED' in env_cpp11:
441 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
442 objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11)
443 objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11)
444diff --git a/test/roles/SConscript b/test/roles/SConscript
445index e86107ece..17b3be105 100644
446--- a/test/roles/SConscript
447+++ b/test/roles/SConscript
448@@ -17,7 +17,7 @@ objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS)
449 prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS)
450 prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS)
451
452-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
453+if 'WSPP_CPP11_ENABLED' in env_cpp11:
454 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
455 objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11)
456 objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11)
457diff --git a/test/transport/SConscript b/test/transport/SConscript
458index 71b31b6c5..aa9b719ec 100644
459--- a/test/transport/SConscript
460+++ b/test/transport/SConscript
461@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono
462 objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS)
463 prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS)
464
465-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
466+if 'WSPP_CPP11_ENABLED' in env_cpp11:
467 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
468 objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11)
469 prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11)
470diff --git a/test/transport/asio/SConscript b/test/transport/asio/SConscript
471index f8185e57e..518d362b1 100644
472--- a/test/transport/asio/SConscript
473+++ b/test/transport/asio/SConscript
474@@ -20,7 +20,7 @@ prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS)
475 prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS)
476 prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS)
477
478-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
479+if 'WSPP_CPP11_ENABLED' in env_cpp11:
480 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
481 objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
482 objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11)
483diff --git a/test/transport/iostream/SConscript b/test/transport/iostream/SConscript
484index 9e74c2f15..dcaf9f2d9 100644
485--- a/test/transport/iostream/SConscript
486+++ b/test/transport/iostream/SConscript
487@@ -19,7 +19,7 @@ prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS =
488 prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS)
489 prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS)
490
491-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
492+if 'WSPP_CPP11_ENABLED' in env_cpp11:
493 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
494 objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
495 objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11)
496diff --git a/test/utility/SConscript b/test/utility/SConscript
497index 80e9ef6c8..6f19aa52a 100644
498--- a/test/utility/SConscript
499+++ b/test/utility/SConscript
500@@ -24,7 +24,7 @@ prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS)
501 prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS)
502 prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS)
503
504-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
505+if 'WSPP_CPP11_ENABLED' in env_cpp11:
506 BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
507 objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11)
508 objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11)