]>
Commit | Line | Data |
---|---|---|
0abc31de JR |
1 | From bbcf7fd0646d74b7f169b3aa4231d9150028ed0d Mon Sep 17 00:00:00 2001 |
2 | From: Rob Peters <info@domoticz.com> | |
3 | Date: Sun, 17 May 2020 11:46:37 +0200 | |
4 | Subject: [PATCH] Avoid deprecated bind placeholders in global namespace | |
5 | ||
6 | --- | |
7 | hardware/ASyncSerial.cpp | 2 +- | |
8 | hardware/ASyncTCP.cpp | 4 +++- | |
9 | hardware/Comm5Serial.cpp | 2 ++ | |
10 | hardware/CurrentCostMeterSerial.cpp | 4 +++- | |
11 | hardware/DavisLoggerSerial.cpp | 4 +++- | |
12 | hardware/DenkoviUSBDevices.cpp | 2 ++ | |
13 | hardware/EnOceanESP2.cpp | 4 +++- | |
14 | hardware/EnOceanESP3.cpp | 4 +++- | |
15 | hardware/EvohomeRadio.cpp | 3 +++ | |
16 | hardware/EvohomeSerial.cpp | 2 ++ | |
17 | hardware/KMTronic433.cpp | 4 +++- | |
18 | hardware/KMTronicBase.cpp | 2 +- | |
19 | hardware/KMTronicSerial.cpp | 4 +++- | |
20 | hardware/MQTT.cpp | 2 ++ | |
21 | hardware/Meteostick.cpp | 4 +++- | |
22 | hardware/MySensorsBase.cpp | 2 +- | |
23 | hardware/MySensorsSerial.cpp | 4 +++- | |
24 | hardware/OTGWBase.cpp | 2 +- | |
25 | hardware/OTGWSerial.cpp | 4 +++- | |
26 | hardware/OpenWebNetUSB.cpp | 3 ++- | |
27 | hardware/P1MeterSerial.cpp | 4 +++- | |
28 | hardware/Pinger.cpp | 2 ++ | |
29 | hardware/RAVEn.cpp | 2 ++ | |
30 | hardware/RFLinkSerial.cpp | 2 ++ | |
31 | hardware/RFXComSerial.cpp | 4 +++- | |
32 | hardware/RFXComTCP.cpp | 2 -- | |
33 | hardware/Rego6XXSerial.cpp | 4 +++- | |
34 | hardware/S0MeterBase.cpp | 2 +- | |
35 | hardware/S0MeterSerial.cpp | 4 +++- | |
36 | hardware/TCPProxy/tcpproxy_server.cpp | 2 ++ | |
37 | hardware/TeleinfoSerial.cpp | 4 +++- | |
38 | hardware/USBtin.cpp | 4 +++- | |
39 | hardware/XiaomiGateway.cpp | 2 +- | |
40 | hardware/Yeelight.h | 1 - | |
41 | hardware/ZiBlueSerial.cpp | 2 ++ | |
42 | hardware/plugins/PluginTransports.cpp | 2 ++ | |
43 | main/WebServer.cpp | 4 +++- | |
44 | main/mainworker.cpp | 2 ++ | |
45 | push/FibaroPush.cpp | 2 ++ | |
46 | push/GooglePubSubPush.cpp | 2 ++ | |
47 | push/HttpPush.cpp | 2 ++ | |
48 | push/InfluxPush.cpp | 2 ++ | |
49 | push/WebsocketPush.cpp | 2 ++ | |
50 | tcpserver/TCPServer.cpp | 2 +- | |
51 | webserver/cWebem.cpp | 2 +- | |
52 | webserver/connection.cpp | 4 +++- | |
53 | webserver/connection_manager.cpp | 4 +++- | |
54 | webserver/proxyclient.cpp | 2 ++ | |
55 | webserver/server.cpp | 4 +++- | |
56 | 49 files changed, 107 insertions(+), 32 deletions(-) | |
57 | ||
58 | diff --git a/hardware/ASyncSerial.cpp b/hardware/ASyncSerial.cpp | |
59 | index 2c9a5e27e9..36dd402fa7 100644 | |
60 | --- a/hardware/ASyncSerial.cpp | |
61 | +++ b/hardware/ASyncSerial.cpp | |
62 | @@ -34,7 +34,7 @@ | |
63 | #include <algorithm> | |
64 | #include <iostream> | |
65 | #include <boost/asio.hpp> | |
66 | -#include <boost/bind.hpp> | |
67 | +#include <boost/bind/bind.hpp> | |
68 | #include <boost/function.hpp> | |
69 | #include <boost/thread.hpp> | |
70 | #include <boost/smart_ptr/shared_array.hpp> // for shared_array | |
71 | diff --git a/hardware/ASyncTCP.cpp b/hardware/ASyncTCP.cpp | |
72 | index 8990c24300..7f7b1e0f24 100644 | |
73 | --- a/hardware/ASyncTCP.cpp | |
74 | +++ b/hardware/ASyncTCP.cpp | |
75 | @@ -1,10 +1,12 @@ | |
76 | #include "stdafx.h" | |
77 | #include "ASyncTCP.h" | |
78 | #include <boost/asio.hpp> | |
79 | -#include <boost/bind.hpp> | |
80 | +#include <boost/bind/bind.hpp> | |
81 | #include <boost/system/error_code.hpp> // for error_code | |
82 | #include "../main/Logger.h" | |
83 | ||
84 | +//using namespace boost::placeholders; | |
85 | + | |
86 | struct hostent; | |
87 | ||
88 | #ifndef WIN32 | |
89 | diff --git a/hardware/Comm5Serial.cpp b/hardware/Comm5Serial.cpp | |
90 | index 9b44496fb5..f1c1f706d2 100644 | |
91 | --- a/hardware/Comm5Serial.cpp | |
92 | +++ b/hardware/Comm5Serial.cpp | |
93 | @@ -5,6 +5,8 @@ | |
94 | #include "../main/Logger.h" | |
95 | #include "../main/RFXtrx.h" | |
96 | ||
97 | +using namespace boost::placeholders; | |
98 | + | |
99 | /* | |
100 | This driver allows Domoticz to control any I/O module from the MA-4xxx Family | |
101 | ||
102 | diff --git a/hardware/CurrentCostMeterSerial.cpp b/hardware/CurrentCostMeterSerial.cpp | |
103 | index 05bac73d6a..bf9d35cab7 100644 | |
104 | --- a/hardware/CurrentCostMeterSerial.cpp | |
105 | +++ b/hardware/CurrentCostMeterSerial.cpp | |
106 | @@ -10,10 +10,12 @@ | |
107 | ||
108 | #include <string> | |
109 | #include <iostream> | |
110 | -#include <boost/bind.hpp> | |
111 | +#include <boost/bind/bind.hpp> | |
112 | ||
113 | #include <ctime> | |
114 | ||
115 | +using namespace boost::placeholders; | |
116 | + | |
117 | // | |
118 | //Class CurrentCostMeterSerial | |
119 | // | |
120 | diff --git a/hardware/DavisLoggerSerial.cpp b/hardware/DavisLoggerSerial.cpp | |
121 | index 9c44539beb..44c9dbde5c 100644 | |
122 | --- a/hardware/DavisLoggerSerial.cpp | |
123 | +++ b/hardware/DavisLoggerSerial.cpp | |
124 | @@ -8,13 +8,15 @@ | |
125 | #include <string> | |
126 | #include <algorithm> | |
127 | #include <iostream> | |
128 | -#include <boost/bind.hpp> | |
129 | +#include <boost/bind/bind.hpp> | |
130 | ||
131 | #include "../main/localtime_r.h" | |
132 | #include "../main/mainworker.h" | |
133 | ||
134 | #include <ctime> | |
135 | ||
136 | +using namespace boost::placeholders; | |
137 | + | |
138 | #ifdef _DEBUG | |
139 | //#define DEBUG_DAVIS | |
140 | #endif | |
141 | diff --git a/hardware/DenkoviUSBDevices.cpp b/hardware/DenkoviUSBDevices.cpp | |
142 | index a7977d82c8..53a27e5583 100644 | |
143 | --- a/hardware/DenkoviUSBDevices.cpp | |
144 | +++ b/hardware/DenkoviUSBDevices.cpp | |
145 | @@ -5,6 +5,8 @@ | |
146 | #include "../main/localtime_r.h" | |
147 | #include "../main/mainworker.h" | |
148 | ||
149 | +using namespace boost::placeholders; | |
150 | + | |
151 | #define MAX_POLL_INTERVAL 3600*1000 | |
152 | ||
153 | #define DAE_IO_TYPE_RELAY 2 | |
154 | diff --git a/hardware/EnOceanESP2.cpp b/hardware/EnOceanESP2.cpp | |
155 | index f20ff9c0cb..fd08c55f63 100644 | |
156 | --- a/hardware/EnOceanESP2.cpp | |
157 | +++ b/hardware/EnOceanESP2.cpp | |
158 | @@ -8,7 +8,7 @@ | |
159 | #include <string> | |
160 | #include <algorithm> | |
161 | #include <iostream> | |
162 | -#include <boost/bind.hpp> | |
163 | +#include <boost/bind/bind.hpp> | |
164 | #include "hardwaretypes.h" | |
165 | #include "../main/localtime_r.h" | |
166 | ||
167 | @@ -16,6 +16,8 @@ | |
168 | #include <cmath> | |
169 | #include <ctime> | |
170 | ||
171 | +using namespace boost::placeholders; | |
172 | + | |
173 | #define ENOCEAN_RETRY_DELAY 30 | |
174 | ||
175 | #define round(a) ( int ) ( a + .5 ) | |
176 | diff --git a/hardware/EnOceanESP3.cpp b/hardware/EnOceanESP3.cpp | |
177 | index 6866eeb0d0..2afa0e1e36 100644 | |
178 | --- a/hardware/EnOceanESP3.cpp | |
179 | +++ b/hardware/EnOceanESP3.cpp | |
180 | @@ -8,7 +8,7 @@ | |
181 | #include <string> | |
182 | #include <algorithm> | |
183 | #include <iostream> | |
184 | -#include <boost/bind.hpp> | |
185 | +#include <boost/bind/bind.hpp> | |
186 | #include "hardwaretypes.h" | |
187 | #include "../main/localtime_r.h" | |
188 | ||
189 | @@ -16,6 +16,8 @@ | |
190 | #include <cmath> | |
191 | #include <ctime> | |
192 | ||
193 | +using namespace boost::placeholders; | |
194 | + | |
195 | #if _DEBUG | |
196 | #define ENOCEAN_BUTTON_DEBUG | |
197 | #endif | |
198 | diff --git a/hardware/EvohomeRadio.cpp b/hardware/EvohomeRadio.cpp | |
199 | index 4da983538b..6ba97158cd 100644 | |
200 | --- a/hardware/EvohomeRadio.cpp | |
201 | +++ b/hardware/EvohomeRadio.cpp | |
202 | @@ -23,6 +23,9 @@ | |
203 | #include "../main/WebServer.h" | |
204 | #include "../webserver/cWebem.h" | |
205 | #include <json/json.h> | |
206 | +#include <boost/bind/bind.hpp> | |
207 | + | |
208 | +using namespace boost::placeholders; | |
209 | ||
210 | extern std::string szUserDataFolder; | |
211 | ||
212 | diff --git a/hardware/EvohomeSerial.cpp b/hardware/EvohomeSerial.cpp | |
213 | index 4a54988291..c74cf576cc 100644 | |
214 | --- a/hardware/EvohomeSerial.cpp | |
215 | +++ b/hardware/EvohomeSerial.cpp | |
216 | @@ -7,6 +7,8 @@ | |
217 | #include "../main/localtime_r.h" | |
218 | #include <boost/exception/diagnostic_information.hpp> | |
219 | ||
220 | +using namespace boost::placeholders; | |
221 | + | |
222 | CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) : | |
223 | CEvohomeRadio(ID, UserContID) | |
224 | { | |
225 | diff --git a/hardware/KMTronic433.cpp b/hardware/KMTronic433.cpp | |
226 | index da81b20f9f..f9832a5a74 100644 | |
227 | --- a/hardware/KMTronic433.cpp | |
228 | +++ b/hardware/KMTronic433.cpp | |
229 | @@ -9,11 +9,13 @@ | |
230 | #include <string> | |
231 | #include <algorithm> | |
232 | #include <iostream> | |
233 | -#include <boost/bind.hpp> | |
234 | +#include <boost/bind/bind.hpp> | |
235 | #include <boost/exception/diagnostic_information.hpp> | |
236 | ||
237 | #include <ctime> | |
238 | ||
239 | +using namespace boost::placeholders; | |
240 | + | |
241 | //#define DEBUG_KMTronic | |
242 | ||
243 | #define RETRY_DELAY 30 | |
244 | diff --git a/hardware/KMTronicBase.cpp b/hardware/KMTronicBase.cpp | |
245 | index b343108966..d9c45872b5 100644 | |
246 | --- a/hardware/KMTronicBase.cpp | |
247 | +++ b/hardware/KMTronicBase.cpp | |
248 | @@ -10,7 +10,7 @@ | |
249 | #include <sstream> | |
250 | #include <algorithm> | |
251 | #include <iostream> | |
252 | -#include <boost/bind.hpp> | |
253 | +#include <boost/bind/bind.hpp> | |
254 | ||
255 | #include <ctime> | |
256 | ||
257 | diff --git a/hardware/KMTronicSerial.cpp b/hardware/KMTronicSerial.cpp | |
258 | index 4e07f2c37a..6240f941bd 100644 | |
259 | --- a/hardware/KMTronicSerial.cpp | |
260 | +++ b/hardware/KMTronicSerial.cpp | |
261 | @@ -10,12 +10,14 @@ | |
262 | #include <string> | |
263 | #include <algorithm> | |
264 | #include <iostream> | |
265 | -#include <boost/bind.hpp> | |
266 | +#include <boost/bind/bind.hpp> | |
267 | #include <boost/exception/diagnostic_information.hpp> | |
268 | #include <ctime> | |
269 | ||
270 | //#define DEBUG_KMTronic | |
271 | ||
272 | +using namespace boost::placeholders; | |
273 | + | |
274 | #define RETRY_DELAY 30 | |
275 | ||
276 | KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname) | |
277 | diff --git a/hardware/MQTT.cpp b/hardware/MQTT.cpp | |
278 | index 8de3671853..19750bb75b 100644 | |
279 | --- a/hardware/MQTT.cpp | |
280 | +++ b/hardware/MQTT.cpp | |
281 | @@ -11,6 +11,8 @@ | |
282 | #define __STDC_FORMAT_MACROS | |
283 | #include <inttypes.h> | |
284 | ||
285 | +using namespace boost::placeholders; | |
286 | + | |
287 | #define RETRY_DELAY 30 | |
288 | ||
289 | #define CLIENTID "Domoticz" | |
290 | diff --git a/hardware/Meteostick.cpp b/hardware/Meteostick.cpp | |
291 | index 9793f4b57b..10da69d6e3 100644 | |
292 | --- a/hardware/Meteostick.cpp | |
293 | +++ b/hardware/Meteostick.cpp | |
294 | @@ -9,12 +9,14 @@ | |
295 | #include <string> | |
296 | #include <algorithm> | |
297 | #include <iostream> | |
298 | -#include <boost/bind.hpp> | |
299 | +#include <boost/bind/bind.hpp> | |
300 | #include "../main/localtime_r.h" | |
301 | #include "../main/mainworker.h" | |
302 | ||
303 | #include <ctime> | |
304 | ||
305 | +using namespace boost::placeholders; | |
306 | + | |
307 | #define RETRY_DELAY 30 | |
308 | ||
309 | #define round(a) ( int ) ( a + .5 ) | |
310 | diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp | |
311 | index af976fba95..42bf58fad5 100644 | |
312 | --- a/hardware/MySensorsBase.cpp | |
313 | +++ b/hardware/MySensorsBase.cpp | |
314 | @@ -13,7 +13,7 @@ | |
315 | #include <sstream> | |
316 | #include <algorithm> | |
317 | #include <iostream> | |
318 | -#include <boost/bind.hpp> | |
319 | +#include <boost/bind/bind.hpp> | |
320 | #include "../webserver/cWebem.h" | |
321 | #include <json/json.h> | |
322 | ||
323 | diff --git a/hardware/MySensorsSerial.cpp b/hardware/MySensorsSerial.cpp | |
324 | index 44f8692d2b..42f3e05409 100644 | |
325 | --- a/hardware/MySensorsSerial.cpp | |
326 | +++ b/hardware/MySensorsSerial.cpp | |
327 | @@ -8,12 +8,14 @@ | |
328 | #include "hardwaretypes.h" | |
329 | ||
330 | #include <algorithm> | |
331 | -#include <boost/bind.hpp> | |
332 | +#include <boost/bind/bind.hpp> | |
333 | #include <boost/exception/diagnostic_information.hpp> | |
334 | #include <ctime> | |
335 | #include <iostream> | |
336 | #include <string> | |
337 | ||
338 | +using namespace boost::placeholders; | |
339 | + | |
340 | //#define DEBUG_MYSENSORS | |
341 | ||
342 | #define RETRY_DELAY 30 | |
343 | diff --git a/hardware/OTGWBase.cpp b/hardware/OTGWBase.cpp | |
344 | index 322574458b..ded3a31c2c 100644 | |
345 | --- a/hardware/OTGWBase.cpp | |
346 | +++ b/hardware/OTGWBase.cpp | |
347 | @@ -12,7 +12,7 @@ | |
348 | #include <string> | |
349 | #include <algorithm> | |
350 | #include <iostream> | |
351 | -#include <boost/bind.hpp> | |
352 | +#include <boost/bind/bind.hpp> | |
353 | #include <json/json.h> | |
354 | ||
355 | #include <ctime> | |
356 | diff --git a/hardware/OTGWSerial.cpp b/hardware/OTGWSerial.cpp | |
357 | index 4ade70e063..5a3416548f 100644 | |
358 | --- a/hardware/OTGWSerial.cpp | |
359 | +++ b/hardware/OTGWSerial.cpp | |
360 | @@ -8,12 +8,14 @@ | |
361 | #include "../main/localtime_r.h" | |
362 | ||
363 | #include <algorithm> | |
364 | -#include <boost/bind.hpp> | |
365 | +#include <boost/bind/bind.hpp> | |
366 | #include <boost/exception/diagnostic_information.hpp> | |
367 | #include <ctime> | |
368 | #include <iostream> | |
369 | #include <string> | |
370 | ||
371 | +using namespace boost::placeholders; | |
372 | + | |
373 | #define RETRY_DELAY 30 | |
374 | #define OTGW_READ_INTERVAL 10 | |
375 | ||
376 | diff --git a/hardware/OpenWebNetUSB.cpp b/hardware/OpenWebNetUSB.cpp | |
377 | index bf23049844..352a2220e9 100644 | |
378 | --- a/hardware/OpenWebNetUSB.cpp | |
379 | +++ b/hardware/OpenWebNetUSB.cpp | |
380 | @@ -19,11 +19,12 @@ License: Public domain | |
381 | ||
382 | #include <algorithm> | |
383 | #include <ctime> | |
384 | -#include <boost/bind.hpp> | |
385 | +#include <boost/bind/bind.hpp> | |
386 | #include <boost/exception/diagnostic_information.hpp> | |
387 | #include <iostream> | |
388 | #include <string> | |
389 | ||
390 | +using namespace boost::placeholders; | |
391 | ||
392 | COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate) | |
393 | { | |
394 | diff --git a/hardware/P1MeterSerial.cpp b/hardware/P1MeterSerial.cpp | |
395 | index 566b451fa5..7dc3e0782e 100644 | |
396 | --- a/hardware/P1MeterSerial.cpp | |
397 | +++ b/hardware/P1MeterSerial.cpp | |
398 | @@ -14,10 +14,12 @@ | |
399 | #include <string> | |
400 | #include <algorithm> | |
401 | #include <iostream> | |
402 | -#include <boost/bind.hpp> | |
403 | +#include <boost/bind/bind.hpp> | |
404 | ||
405 | #include <ctime> | |
406 | ||
407 | +using namespace boost::placeholders; | |
408 | + | |
409 | #ifdef _DEBUG | |
410 | //#define DEBUG_P1_R | |
411 | #endif | |
412 | diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp | |
413 | index d3e2fda942..b6dc78a786 100644 | |
414 | --- a/hardware/Pinger.cpp | |
415 | +++ b/hardware/Pinger.cpp | |
416 | @@ -19,6 +19,8 @@ | |
417 | ||
418 | #include <iostream> | |
419 | ||
420 | +using namespace boost::placeholders; | |
421 | + | |
422 | #if BOOST_VERSION >= 107000 | |
423 | #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) | |
424 | #else | |
425 | diff --git a/hardware/RAVEn.cpp b/hardware/RAVEn.cpp | |
426 | index d9efc7480a..b6a4399d04 100644 | |
427 | --- a/hardware/RAVEn.cpp | |
428 | +++ b/hardware/RAVEn.cpp | |
429 | @@ -8,6 +8,8 @@ | |
430 | #include "hardwaretypes.h" | |
431 | #include <tinyxml.h> | |
432 | ||
433 | +using namespace boost::placeholders; | |
434 | + | |
435 | //Rainforest RAVEn USB ZigBee Smart Meter Adapter | |
436 | //https://rainforestautomation.com/rfa-z106-raven/ | |
437 | ||
438 | diff --git a/hardware/RFLinkSerial.cpp b/hardware/RFLinkSerial.cpp | |
439 | index c5cae0f739..4ab07ed88e 100644 | |
440 | --- a/hardware/RFLinkSerial.cpp | |
441 | +++ b/hardware/RFLinkSerial.cpp | |
442 | @@ -5,6 +5,8 @@ | |
443 | #include "../main/localtime_r.h" | |
444 | #include <boost/exception/diagnostic_information.hpp> | |
445 | ||
446 | +using namespace boost::placeholders; | |
447 | + | |
448 | CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) : | |
449 | m_szSerialPort(devname) | |
450 | { | |
451 | diff --git a/hardware/RFXComSerial.cpp b/hardware/RFXComSerial.cpp | |
452 | index dc85f4832d..4c39520510 100644 | |
453 | --- a/hardware/RFXComSerial.cpp | |
454 | +++ b/hardware/RFXComSerial.cpp | |
455 | @@ -12,7 +12,7 @@ | |
456 | #include <string> | |
457 | #include <algorithm> | |
458 | #include <iostream> | |
459 | -#include <boost/bind.hpp> | |
460 | +#include <boost/bind/bind.hpp> | |
461 | ||
462 | #include <ctime> | |
463 | ||
464 | @@ -23,6 +23,8 @@ | |
465 | #include <pwd.h> | |
466 | #endif | |
467 | ||
468 | +using namespace boost::placeholders; | |
469 | + | |
470 | #define RETRY_DELAY 30 | |
471 | ||
472 | #define RFX_WRITE_DELAY 300 | |
473 | diff --git a/hardware/RFXComTCP.cpp b/hardware/RFXComTCP.cpp | |
474 | index 7c6b3954b8..0e4856fbfb 100644 | |
475 | --- a/hardware/RFXComTCP.cpp | |
476 | +++ b/hardware/RFXComTCP.cpp | |
477 | @@ -1,8 +1,6 @@ | |
478 | #include "stdafx.h" | |
479 | #include "RFXComTCP.h" | |
480 | #include "../main/Logger.h" | |
481 | -//#include <boost/bind.hpp> | |
482 | -//#include <boost/asio.hpp> | |
483 | #include "../main/Helper.h" | |
484 | #include "../main/localtime_r.h" | |
485 | #include "../main/mainworker.h" | |
486 | diff --git a/hardware/Rego6XXSerial.cpp b/hardware/Rego6XXSerial.cpp | |
487 | index b94bd291bc..15d22f869a 100644 | |
488 | --- a/hardware/Rego6XXSerial.cpp | |
489 | +++ b/hardware/Rego6XXSerial.cpp | |
490 | @@ -16,11 +16,13 @@ | |
491 | #include <string> | |
492 | #include <algorithm> | |
493 | #include <iostream> | |
494 | -#include <boost/bind.hpp> | |
495 | +#include <boost/bind/bind.hpp> | |
496 | #include "hardwaretypes.h" | |
497 | ||
498 | #include <ctime> | |
499 | ||
500 | +using namespace boost::placeholders; | |
501 | + | |
502 | #define Rego6XX_RETRY_DELAY 30 | |
503 | #define Rego6XX_COMMAND_DELAY 5 | |
504 | #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1) | |
505 | diff --git a/hardware/S0MeterBase.cpp b/hardware/S0MeterBase.cpp | |
506 | index 9cffa67022..75a06e2cc1 100644 | |
507 | --- a/hardware/S0MeterBase.cpp | |
508 | +++ b/hardware/S0MeterBase.cpp | |
509 | @@ -13,7 +13,7 @@ | |
510 | #include <string> | |
511 | #include <algorithm> | |
512 | #include <iostream> | |
513 | -#include <boost/bind.hpp> | |
514 | +#include <boost/bind/bind.hpp> | |
515 | ||
516 | #include <ctime> | |
517 | ||
518 | diff --git a/hardware/S0MeterSerial.cpp b/hardware/S0MeterSerial.cpp | |
519 | index 1dc16b2b3e..f474d1c766 100644 | |
520 | --- a/hardware/S0MeterSerial.cpp | |
521 | +++ b/hardware/S0MeterSerial.cpp | |
522 | @@ -8,11 +8,13 @@ | |
523 | ||
524 | #include <algorithm> | |
525 | #include <ctime> | |
526 | -#include <boost/bind.hpp> | |
527 | +#include <boost/bind/bind.hpp> | |
528 | #include <boost/exception/diagnostic_information.hpp> | |
529 | #include <iostream> | |
530 | #include <string> | |
531 | ||
532 | +using namespace boost::placeholders; | |
533 | + | |
534 | #ifdef _DEBUG | |
535 | //#define DEBUG_S0 | |
536 | #define TOT_DEBUG_LINES 6 | |
537 | diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp | |
538 | index 60445d9c28..82ba3559d9 100644 | |
539 | --- a/hardware/TCPProxy/tcpproxy_server.cpp | |
540 | +++ b/hardware/TCPProxy/tcpproxy_server.cpp | |
541 | @@ -15,6 +15,8 @@ | |
542 | #include "stdafx.h" | |
543 | #include "tcpproxy_server.h" | |
544 | ||
545 | +using namespace boost::placeholders; | |
546 | + | |
547 | #if BOOST_VERSION >= 107000 | |
548 | #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) | |
549 | #else | |
550 | diff --git a/hardware/TeleinfoSerial.cpp b/hardware/TeleinfoSerial.cpp | |
551 | index 85f9a6240f..fa794802e9 100644 | |
552 | --- a/hardware/TeleinfoSerial.cpp | |
553 | +++ b/hardware/TeleinfoSerial.cpp | |
554 | @@ -28,9 +28,11 @@ History : | |
555 | #include "../main/localtime_r.h" | |
556 | #include "../main/Logger.h" | |
557 | ||
558 | -#include <boost/bind.hpp> | |
559 | +#include <boost/bind/bind.hpp> | |
560 | #include <boost/exception/diagnostic_information.hpp> | |
561 | ||
562 | +using namespace boost::placeholders; | |
563 | + | |
564 | CTeleinfoSerial::CTeleinfoSerial(const int ID, const std::string& devname, const int datatimeout, unsigned int baud_rate, const bool disable_crc, const int ratelimit) | |
565 | { | |
566 | m_HwdID = ID; | |
567 | diff --git a/hardware/USBtin.cpp b/hardware/USBtin.cpp | |
568 | index c3e3656319..ce6f542df3 100644 | |
569 | --- a/hardware/USBtin.cpp | |
570 | +++ b/hardware/USBtin.cpp | |
571 | @@ -27,7 +27,7 @@ History : | |
572 | #include "../main/SQLHelper.h" | |
573 | ||
574 | #include <algorithm> | |
575 | -#include <boost/bind.hpp> | |
576 | +#include <boost/bind/bind.hpp> | |
577 | #include <boost/exception/diagnostic_information.hpp> | |
578 | #include <cstdlib> | |
579 | #include <ctime> | |
580 | @@ -35,6 +35,8 @@ History : | |
581 | #include <string> | |
582 | #include <time.h> | |
583 | ||
584 | +using namespace boost::placeholders; | |
585 | + | |
586 | #define USBTIN_BAUD_RATE 115200 | |
587 | #define USBTIN_PARITY boost::asio::serial_port_base::parity::none | |
588 | #define USBTIN_CARACTER_SIZE 8 | |
589 | diff --git a/hardware/XiaomiGateway.cpp b/hardware/XiaomiGateway.cpp | |
590 | index f4567ec62f..e4998faa6a 100644 | |
591 | --- a/hardware/XiaomiGateway.cpp | |
592 | +++ b/hardware/XiaomiGateway.cpp | |
593 | @@ -12,7 +12,7 @@ | |
594 | #include "XiaomiHardware.h" | |
595 | #include <openssl/aes.h> | |
596 | #include <boost/asio.hpp> | |
597 | -#include <boost/bind.hpp> | |
598 | +#include <boost/bind/bind.hpp> | |
599 | ||
600 | #ifndef WIN32 | |
601 | #include <ifaddrs.h> | |
602 | diff --git a/hardware/Yeelight.h b/hardware/Yeelight.h | |
603 | index b063f79743..64fd6f5479 100644 | |
604 | --- a/hardware/Yeelight.h | |
605 | +++ b/hardware/Yeelight.h | |
606 | @@ -2,7 +2,6 @@ | |
607 | ||
608 | #include "DomoticzHardware.h" | |
609 | #include <boost/asio.hpp> | |
610 | -#include <boost/bind.hpp> | |
611 | ||
612 | class Yeelight : public CDomoticzHardwareBase | |
613 | { | |
614 | diff --git a/hardware/ZiBlueSerial.cpp b/hardware/ZiBlueSerial.cpp | |
615 | index 9e9db2aff1..8e896897fc 100644 | |
616 | --- a/hardware/ZiBlueSerial.cpp | |
617 | +++ b/hardware/ZiBlueSerial.cpp | |
618 | @@ -6,6 +6,8 @@ | |
619 | ||
620 | #include <boost/exception/diagnostic_information.hpp> | |
621 | ||
622 | +using namespace boost::placeholders; | |
623 | + | |
624 | #define ZiBlue_RETRY_DELAY 30 | |
625 | ||
626 | CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) : | |
627 | diff --git a/hardware/plugins/PluginTransports.cpp b/hardware/plugins/PluginTransports.cpp | |
628 | index c7e065529f..7fc1cb953e 100644 | |
629 | --- a/hardware/plugins/PluginTransports.cpp | |
630 | +++ b/hardware/plugins/PluginTransports.cpp | |
631 | @@ -13,6 +13,8 @@ | |
632 | #include "icmp_header.hpp" | |
633 | #include "ipv4_header.hpp" | |
634 | ||
635 | +using namespace boost::placeholders; | |
636 | + | |
637 | namespace Plugins { | |
638 | ||
639 | void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred) | |
640 | diff --git a/main/WebServer.cpp b/main/WebServer.cpp | |
641 | index 0a19319669..ed92f06e32 100644 | |
642 | --- a/main/WebServer.cpp | |
643 | +++ b/main/WebServer.cpp | |
644 | @@ -1,7 +1,7 @@ | |
645 | #include "stdafx.h" | |
646 | #include "WebServer.h" | |
647 | #include "WebServerHelper.h" | |
648 | -#include <boost/bind.hpp> | |
649 | +#include <boost/bind/bind.hpp> | |
650 | #include <iostream> | |
651 | #include <fstream> | |
652 | #include "mainworker.h" | |
653 | @@ -65,6 +65,8 @@ | |
654 | #define __STDC_FORMAT_MACROS | |
655 | #include <inttypes.h> | |
656 | ||
657 | +using namespace boost::placeholders; | |
658 | + | |
659 | #define round(a) ( int ) ( a + .5 ) | |
660 | ||
661 | extern std::string szStartupFolder; | |
662 | diff --git a/main/mainworker.cpp b/main/mainworker.cpp | |
663 | index 505f59f49d..5fb2ee9042 100644 | |
664 | --- a/main/mainworker.cpp | |
665 | +++ b/main/mainworker.cpp | |
666 | @@ -174,6 +174,8 @@ | |
667 | #include <fstream> | |
668 | #endif | |
669 | ||
670 | +using namespace boost::placeholders; | |
671 | + | |
672 | #define round(a) ( int ) ( a + .5 ) | |
673 | ||
674 | extern std::string szStartupFolder; | |
675 | diff --git a/push/FibaroPush.cpp b/push/FibaroPush.cpp | |
676 | index 0bc54e6cfd..350a8fa893 100644 | |
677 | --- a/push/FibaroPush.cpp | |
678 | +++ b/push/FibaroPush.cpp | |
679 | @@ -14,6 +14,8 @@ | |
680 | #define __STDC_FORMAT_MACROS | |
681 | #include <inttypes.h> | |
682 | ||
683 | +using namespace boost::placeholders; | |
684 | + | |
685 | CFibaroPush::CFibaroPush() | |
686 | { | |
687 | m_PushType = PushType::PUSHTYPE_FIBARO; | |
688 | diff --git a/push/GooglePubSubPush.cpp b/push/GooglePubSubPush.cpp | |
689 | index 6d0fc82d40..a5b720f219 100644 | |
690 | --- a/push/GooglePubSubPush.cpp | |
691 | +++ b/push/GooglePubSubPush.cpp | |
692 | @@ -21,6 +21,8 @@ extern "C" { | |
693 | #include <boost/python.hpp> | |
694 | #endif | |
695 | ||
696 | +using namespace boost::placeholders; | |
697 | + | |
698 | extern std::string szUserDataFolder; | |
699 | ||
700 | // this should be filled in by the preprocessor | |
701 | diff --git a/push/HttpPush.cpp b/push/HttpPush.cpp | |
702 | index 8132ca2b43..3d1d51d52e 100644 | |
703 | --- a/push/HttpPush.cpp | |
704 | +++ b/push/HttpPush.cpp | |
705 | @@ -15,6 +15,8 @@ | |
706 | #define __STDC_FORMAT_MACROS | |
707 | #include <inttypes.h> | |
708 | ||
709 | +using namespace boost::placeholders; | |
710 | + | |
711 | CHttpPush::CHttpPush() | |
712 | { | |
713 | m_PushType = PushType::PUSHTYPE_HTTP; | |
714 | diff --git a/push/InfluxPush.cpp b/push/InfluxPush.cpp | |
715 | index 0a8e99414f..745fdf0496 100644 | |
716 | --- a/push/InfluxPush.cpp | |
717 | +++ b/push/InfluxPush.cpp | |
718 | @@ -15,6 +15,8 @@ | |
719 | #define __STDC_FORMAT_MACROS | |
720 | #include <inttypes.h> | |
721 | ||
722 | +using namespace boost::placeholders; | |
723 | + | |
724 | CInfluxPush::CInfluxPush() : | |
725 | m_InfluxPort(8086), | |
726 | m_bInfluxDebugActive(false) | |
727 | diff --git a/push/WebsocketPush.cpp b/push/WebsocketPush.cpp | |
728 | index 0fb71f96ec..3c2ce7ed54 100644 | |
729 | --- a/push/WebsocketPush.cpp | |
730 | +++ b/push/WebsocketPush.cpp | |
731 | @@ -3,6 +3,8 @@ | |
732 | #include "../webserver/WebsocketHandler.h" | |
733 | #include "../main/mainworker.h" | |
734 | ||
735 | +using namespace boost::placeholders; | |
736 | + | |
737 | extern boost::signals2::signal<void(const std::string &Subject, const std::string &Text, const std::string &ExtraData, const int Priority, const std::string & Sound, const bool bFromNotification)> sOnNotificationReceived; | |
738 | ||
739 | ||
740 | diff --git a/tcpserver/TCPServer.cpp b/tcpserver/TCPServer.cpp | |
741 | index d3b0a94847..3b8d0b9b76 100644 | |
742 | --- a/tcpserver/TCPServer.cpp | |
743 | +++ b/tcpserver/TCPServer.cpp | |
744 | @@ -11,7 +11,7 @@ | |
745 | #include "../main/localtime_r.h" | |
746 | #include <boost/asio.hpp> | |
747 | #include <algorithm> | |
748 | -#include <boost/bind.hpp> | |
749 | +#include <boost/bind/bind.hpp> | |
750 | ||
751 | namespace tcp { | |
752 | namespace server { | |
753 | diff --git a/webserver/cWebem.cpp b/webserver/cWebem.cpp | |
754 | index f015be097f..63c96f789f 100644 | |
755 | --- a/webserver/cWebem.cpp | |
756 | +++ b/webserver/cWebem.cpp | |
757 | @@ -5,7 +5,7 @@ | |
758 | //Modified, extended etc by Robbert E. Peters/RTSS B.V. | |
759 | #include "stdafx.h" | |
760 | #include "cWebem.h" | |
761 | -#include <boost/bind.hpp> | |
762 | +#include <boost/bind/bind.hpp> | |
763 | #include "reply.hpp" | |
764 | #include "request.hpp" | |
765 | #include "mime_types.hpp" | |
766 | diff --git a/webserver/connection.cpp b/webserver/connection.cpp | |
767 | index d3485fe923..afe700e5d7 100644 | |
768 | --- a/webserver/connection.cpp | |
769 | +++ b/webserver/connection.cpp | |
770 | @@ -9,7 +9,7 @@ | |
771 | // | |
772 | #include "stdafx.h" | |
773 | #include "connection.hpp" | |
774 | -#include <boost/bind.hpp> | |
775 | +#include <boost/bind/bind.hpp> | |
776 | #include <boost/algorithm/string.hpp> | |
777 | #include "connection_manager.hpp" | |
778 | #include "request_handler.hpp" | |
779 | @@ -17,6 +17,8 @@ | |
780 | #include "../main/localtime_r.h" | |
781 | #include "../main/Logger.h" | |
782 | ||
783 | +using namespace boost::placeholders; | |
784 | + | |
785 | namespace http { | |
786 | namespace server { | |
787 | extern std::string convert_to_http_date(time_t time); | |
788 | diff --git a/webserver/connection_manager.cpp b/webserver/connection_manager.cpp | |
789 | index b6c20de53f..bf1d9882d0 100644 | |
790 | --- a/webserver/connection_manager.cpp | |
791 | +++ b/webserver/connection_manager.cpp | |
792 | @@ -10,10 +10,12 @@ | |
793 | #include "stdafx.h" | |
794 | #include "connection_manager.hpp" | |
795 | #include <algorithm> | |
796 | -#include <boost/bind.hpp> | |
797 | +#include <boost/bind/bind.hpp> | |
798 | #include <iostream> | |
799 | #include "../main/Logger.h" | |
800 | ||
801 | +using namespace boost::placeholders; | |
802 | + | |
803 | namespace http { | |
804 | namespace server { | |
805 | ||
806 | diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp | |
807 | index c2bcd3178f..423ee0fb4b 100644 | |
808 | --- a/webserver/proxyclient.cpp | |
809 | +++ b/webserver/proxyclient.cpp | |
810 | @@ -8,6 +8,8 @@ | |
811 | #include "../tcpserver/TCPServer.h" | |
812 | #include "sha1.hpp" | |
813 | ||
814 | +using namespace boost::placeholders; | |
815 | + | |
816 | // RK: some defines to make mydomoticz also work when openssl not compiled in | |
817 | #ifdef WWW_ENABLE_SSL | |
818 | #define PROXY_PORT 443 | |
819 | diff --git a/webserver/server.cpp b/webserver/server.cpp | |
820 | index 1eb2137ef2..6025b1cdb5 100644 | |
821 | --- a/webserver/server.cpp | |
822 | +++ b/webserver/server.cpp | |
823 | @@ -3,7 +3,7 @@ | |
824 | // ~~~~~~~~~~ | |
825 | // | |
826 | #include "stdafx.h" | |
827 | -#include <boost/bind.hpp> | |
828 | +#include <boost/bind/bind.hpp> | |
829 | #include "server.hpp" | |
830 | #include <fstream> | |
831 | #include "../main/Logger.h" | |
832 | @@ -11,6 +11,8 @@ | |
833 | #include "../main/localtime_r.h" | |
834 | #include "../main/mainworker.h" | |
835 | ||
836 | +using namespace boost::placeholders; | |
837 | + | |
838 | extern bool g_bIsWSL; | |
839 | ||
840 | namespace http { |