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