You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

742 lines
18 KiB

  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. hardware/ASyncSerial.cpp | 2 +-
  7. hardware/ASyncTCP.cpp | 4 +++-
  8. hardware/Comm5Serial.cpp | 2 ++
  9. hardware/CurrentCostMeterSerial.cpp | 4 +++-
  10. hardware/DavisLoggerSerial.cpp | 4 +++-
  11. hardware/DenkoviUSBDevices.cpp | 2 ++
  12. hardware/EnOceanESP2.cpp | 4 +++-
  13. hardware/EnOceanESP3.cpp | 4 +++-
  14. hardware/EvohomeRadio.cpp | 3 +++
  15. hardware/EvohomeSerial.cpp | 2 ++
  16. hardware/KMTronic433.cpp | 4 +++-
  17. hardware/KMTronicBase.cpp | 2 +-
  18. hardware/KMTronicSerial.cpp | 4 +++-
  19. hardware/MQTT.cpp | 2 ++
  20. hardware/Meteostick.cpp | 4 +++-
  21. hardware/MySensorsBase.cpp | 2 +-
  22. hardware/MySensorsSerial.cpp | 4 +++-
  23. hardware/OTGWBase.cpp | 2 +-
  24. hardware/OTGWSerial.cpp | 4 +++-
  25. hardware/OpenWebNetUSB.cpp | 3 ++-
  26. hardware/P1MeterSerial.cpp | 4 +++-
  27. hardware/Pinger.cpp | 2 ++
  28. hardware/RAVEn.cpp | 2 ++
  29. hardware/RFLinkSerial.cpp | 2 ++
  30. hardware/RFXComSerial.cpp | 4 +++-
  31. hardware/RFXComTCP.cpp | 2 --
  32. hardware/Rego6XXSerial.cpp | 4 +++-
  33. hardware/S0MeterBase.cpp | 2 +-
  34. hardware/S0MeterSerial.cpp | 4 +++-
  35. hardware/TCPProxy/tcpproxy_server.cpp | 2 ++
  36. hardware/TeleinfoSerial.cpp | 4 +++-
  37. hardware/USBtin.cpp | 4 +++-
  38. hardware/XiaomiGateway.cpp | 2 +-
  39. hardware/Yeelight.h | 1 -
  40. hardware/ZiBlueSerial.cpp | 2 ++
  41. hardware/plugins/PluginTransports.cpp | 2 ++
  42. main/WebServer.cpp | 4 +++-
  43. main/mainworker.cpp | 2 ++
  44. push/FibaroPush.cpp | 2 ++
  45. push/GooglePubSubPush.cpp | 2 ++
  46. push/HttpPush.cpp | 2 ++
  47. push/InfluxPush.cpp | 2 ++
  48. push/WebsocketPush.cpp | 2 ++
  49. tcpserver/TCPServer.cpp | 2 +-
  50. webserver/cWebem.cpp | 2 +-
  51. webserver/connection.cpp | 4 +++-
  52. webserver/connection_manager.cpp | 4 +++-
  53. webserver/proxyclient.cpp | 2 ++
  54. webserver/server.cpp | 4 +++-
  55. 49 files changed, 107 insertions(+), 32 deletions(-)
  56. --- a/hardware/ASyncSerial.cpp
  57. +++ b/hardware/ASyncSerial.cpp
  58. @@ -34,7 +34,7 @@
  59. #include <algorithm>
  60. #include <iostream>
  61. #include <boost/asio.hpp>
  62. -#include <boost/bind.hpp>
  63. +#include <boost/bind/bind.hpp>
  64. #include <boost/function.hpp>
  65. #include <boost/thread.hpp>
  66. #include <boost/smart_ptr/shared_array.hpp> // for shared_array
  67. --- a/hardware/ASyncTCP.cpp
  68. +++ b/hardware/ASyncTCP.cpp
  69. @@ -1,10 +1,12 @@
  70. #include "stdafx.h"
  71. #include "ASyncTCP.h"
  72. #include <boost/asio.hpp>
  73. -#include <boost/bind.hpp>
  74. +#include <boost/bind/bind.hpp>
  75. #include <boost/system/error_code.hpp> // for error_code
  76. #include "../main/Logger.h"
  77. +//using namespace boost::placeholders;
  78. +
  79. struct hostent;
  80. #ifndef WIN32
  81. --- a/hardware/Comm5Serial.cpp
  82. +++ b/hardware/Comm5Serial.cpp
  83. @@ -5,6 +5,8 @@
  84. #include "../main/Logger.h"
  85. #include "../main/RFXtrx.h"
  86. +using namespace boost::placeholders;
  87. +
  88. /*
  89. This driver allows Domoticz to control any I/O module from the MA-4xxx Family
  90. --- a/hardware/CurrentCostMeterSerial.cpp
  91. +++ b/hardware/CurrentCostMeterSerial.cpp
  92. @@ -10,10 +10,12 @@
  93. #include <string>
  94. #include <iostream>
  95. -#include <boost/bind.hpp>
  96. +#include <boost/bind/bind.hpp>
  97. #include <ctime>
  98. +using namespace boost::placeholders;
  99. +
  100. //
  101. //Class CurrentCostMeterSerial
  102. //
  103. --- a/hardware/DavisLoggerSerial.cpp
  104. +++ b/hardware/DavisLoggerSerial.cpp
  105. @@ -8,13 +8,15 @@
  106. #include <string>
  107. #include <algorithm>
  108. #include <iostream>
  109. -#include <boost/bind.hpp>
  110. +#include <boost/bind/bind.hpp>
  111. #include "../main/localtime_r.h"
  112. #include "../main/mainworker.h"
  113. #include <ctime>
  114. +using namespace boost::placeholders;
  115. +
  116. #ifdef _DEBUG
  117. //#define DEBUG_DAVIS
  118. #endif
  119. --- a/hardware/DenkoviUSBDevices.cpp
  120. +++ b/hardware/DenkoviUSBDevices.cpp
  121. @@ -5,6 +5,8 @@
  122. #include "../main/localtime_r.h"
  123. #include "../main/mainworker.h"
  124. +using namespace boost::placeholders;
  125. +
  126. #define MAX_POLL_INTERVAL 3600*1000
  127. #define DAE_IO_TYPE_RELAY 2
  128. --- a/hardware/EnOceanESP2.cpp
  129. +++ b/hardware/EnOceanESP2.cpp
  130. @@ -8,7 +8,7 @@
  131. #include <string>
  132. #include <algorithm>
  133. #include <iostream>
  134. -#include <boost/bind.hpp>
  135. +#include <boost/bind/bind.hpp>
  136. #include "hardwaretypes.h"
  137. #include "../main/localtime_r.h"
  138. @@ -16,6 +16,8 @@
  139. #include <cmath>
  140. #include <ctime>
  141. +using namespace boost::placeholders;
  142. +
  143. #define ENOCEAN_RETRY_DELAY 30
  144. #define round(a) ( int ) ( a + .5 )
  145. --- a/hardware/EnOceanESP3.cpp
  146. +++ b/hardware/EnOceanESP3.cpp
  147. @@ -8,7 +8,7 @@
  148. #include <string>
  149. #include <algorithm>
  150. #include <iostream>
  151. -#include <boost/bind.hpp>
  152. +#include <boost/bind/bind.hpp>
  153. #include "hardwaretypes.h"
  154. #include "../main/localtime_r.h"
  155. @@ -16,6 +16,8 @@
  156. #include <cmath>
  157. #include <ctime>
  158. +using namespace boost::placeholders;
  159. +
  160. #if _DEBUG
  161. #define ENOCEAN_BUTTON_DEBUG
  162. #endif
  163. --- a/hardware/EvohomeRadio.cpp
  164. +++ b/hardware/EvohomeRadio.cpp
  165. @@ -23,6 +23,9 @@
  166. #include "../main/WebServer.h"
  167. #include "../webserver/cWebem.h"
  168. #include <json/json.h>
  169. +#include <boost/bind/bind.hpp>
  170. +
  171. +using namespace boost::placeholders;
  172. extern std::string szUserDataFolder;
  173. --- a/hardware/EvohomeSerial.cpp
  174. +++ b/hardware/EvohomeSerial.cpp
  175. @@ -7,6 +7,8 @@
  176. #include "../main/localtime_r.h"
  177. #include <boost/exception/diagnostic_information.hpp>
  178. +using namespace boost::placeholders;
  179. +
  180. CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) :
  181. CEvohomeRadio(ID, UserContID)
  182. {
  183. --- a/hardware/KMTronic433.cpp
  184. +++ b/hardware/KMTronic433.cpp
  185. @@ -9,11 +9,13 @@
  186. #include <string>
  187. #include <algorithm>
  188. #include <iostream>
  189. -#include <boost/bind.hpp>
  190. +#include <boost/bind/bind.hpp>
  191. #include <boost/exception/diagnostic_information.hpp>
  192. #include <ctime>
  193. +using namespace boost::placeholders;
  194. +
  195. //#define DEBUG_KMTronic
  196. #define RETRY_DELAY 30
  197. --- a/hardware/KMTronicBase.cpp
  198. +++ b/hardware/KMTronicBase.cpp
  199. @@ -10,7 +10,7 @@
  200. #include <sstream>
  201. #include <algorithm>
  202. #include <iostream>
  203. -#include <boost/bind.hpp>
  204. +#include <boost/bind/bind.hpp>
  205. #include <ctime>
  206. --- a/hardware/KMTronicSerial.cpp
  207. +++ b/hardware/KMTronicSerial.cpp
  208. @@ -10,12 +10,14 @@
  209. #include <string>
  210. #include <algorithm>
  211. #include <iostream>
  212. -#include <boost/bind.hpp>
  213. +#include <boost/bind/bind.hpp>
  214. #include <boost/exception/diagnostic_information.hpp>
  215. #include <ctime>
  216. //#define DEBUG_KMTronic
  217. +using namespace boost::placeholders;
  218. +
  219. #define RETRY_DELAY 30
  220. KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname)
  221. --- a/hardware/MQTT.cpp
  222. +++ b/hardware/MQTT.cpp
  223. @@ -11,6 +11,8 @@
  224. #define __STDC_FORMAT_MACROS
  225. #include <inttypes.h>
  226. +using namespace boost::placeholders;
  227. +
  228. #define RETRY_DELAY 30
  229. #define CLIENTID "Domoticz"
  230. --- a/hardware/Meteostick.cpp
  231. +++ b/hardware/Meteostick.cpp
  232. @@ -9,12 +9,14 @@
  233. #include <string>
  234. #include <algorithm>
  235. #include <iostream>
  236. -#include <boost/bind.hpp>
  237. +#include <boost/bind/bind.hpp>
  238. #include "../main/localtime_r.h"
  239. #include "../main/mainworker.h"
  240. #include <ctime>
  241. +using namespace boost::placeholders;
  242. +
  243. #define RETRY_DELAY 30
  244. #define round(a) ( int ) ( a + .5 )
  245. --- a/hardware/MySensorsBase.cpp
  246. +++ b/hardware/MySensorsBase.cpp
  247. @@ -13,7 +13,7 @@
  248. #include <sstream>
  249. #include <algorithm>
  250. #include <iostream>
  251. -#include <boost/bind.hpp>
  252. +#include <boost/bind/bind.hpp>
  253. #include "../webserver/cWebem.h"
  254. #include <json/json.h>
  255. --- a/hardware/MySensorsSerial.cpp
  256. +++ b/hardware/MySensorsSerial.cpp
  257. @@ -8,12 +8,14 @@
  258. #include "hardwaretypes.h"
  259. #include <algorithm>
  260. -#include <boost/bind.hpp>
  261. +#include <boost/bind/bind.hpp>
  262. #include <boost/exception/diagnostic_information.hpp>
  263. #include <ctime>
  264. #include <iostream>
  265. #include <string>
  266. +using namespace boost::placeholders;
  267. +
  268. //#define DEBUG_MYSENSORS
  269. #define RETRY_DELAY 30
  270. --- a/hardware/OTGWBase.cpp
  271. +++ b/hardware/OTGWBase.cpp
  272. @@ -12,7 +12,7 @@
  273. #include <string>
  274. #include <algorithm>
  275. #include <iostream>
  276. -#include <boost/bind.hpp>
  277. +#include <boost/bind/bind.hpp>
  278. #include <json/json.h>
  279. #include <ctime>
  280. --- a/hardware/OTGWSerial.cpp
  281. +++ b/hardware/OTGWSerial.cpp
  282. @@ -8,12 +8,14 @@
  283. #include "../main/localtime_r.h"
  284. #include <algorithm>
  285. -#include <boost/bind.hpp>
  286. +#include <boost/bind/bind.hpp>
  287. #include <boost/exception/diagnostic_information.hpp>
  288. #include <ctime>
  289. #include <iostream>
  290. #include <string>
  291. +using namespace boost::placeholders;
  292. +
  293. #define RETRY_DELAY 30
  294. #define OTGW_READ_INTERVAL 10
  295. --- a/hardware/OpenWebNetUSB.cpp
  296. +++ b/hardware/OpenWebNetUSB.cpp
  297. @@ -19,11 +19,12 @@ License: Public domain
  298. #include <algorithm>
  299. #include <ctime>
  300. -#include <boost/bind.hpp>
  301. +#include <boost/bind/bind.hpp>
  302. #include <boost/exception/diagnostic_information.hpp>
  303. #include <iostream>
  304. #include <string>
  305. +using namespace boost::placeholders;
  306. COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate)
  307. {
  308. --- a/hardware/P1MeterSerial.cpp
  309. +++ b/hardware/P1MeterSerial.cpp
  310. @@ -14,10 +14,12 @@
  311. #include <string>
  312. #include <algorithm>
  313. #include <iostream>
  314. -#include <boost/bind.hpp>
  315. +#include <boost/bind/bind.hpp>
  316. #include <ctime>
  317. +using namespace boost::placeholders;
  318. +
  319. #ifdef _DEBUG
  320. //#define DEBUG_P1_R
  321. #endif
  322. --- a/hardware/Pinger.cpp
  323. +++ b/hardware/Pinger.cpp
  324. @@ -19,6 +19,8 @@
  325. #include <iostream>
  326. +using namespace boost::placeholders;
  327. +
  328. #if BOOST_VERSION >= 107000
  329. #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
  330. #else
  331. --- a/hardware/RAVEn.cpp
  332. +++ b/hardware/RAVEn.cpp
  333. @@ -8,6 +8,8 @@
  334. #include "../tinyxpath/tinyxml.h"
  335. #include "hardwaretypes.h"
  336. +using namespace boost::placeholders;
  337. +
  338. //Rainforest RAVEn USB ZigBee Smart Meter Adapter
  339. //https://rainforestautomation.com/rfa-z106-raven/
  340. --- a/hardware/RFLinkSerial.cpp
  341. +++ b/hardware/RFLinkSerial.cpp
  342. @@ -5,6 +5,8 @@
  343. #include "../main/localtime_r.h"
  344. #include <boost/exception/diagnostic_information.hpp>
  345. +using namespace boost::placeholders;
  346. +
  347. CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) :
  348. m_szSerialPort(devname)
  349. {
  350. --- a/hardware/RFXComSerial.cpp
  351. +++ b/hardware/RFXComSerial.cpp
  352. @@ -12,7 +12,7 @@
  353. #include <string>
  354. #include <algorithm>
  355. #include <iostream>
  356. -#include <boost/bind.hpp>
  357. +#include <boost/bind/bind.hpp>
  358. #include <ctime>
  359. @@ -23,6 +23,8 @@
  360. #include <pwd.h>
  361. #endif
  362. +using namespace boost::placeholders;
  363. +
  364. #define RETRY_DELAY 30
  365. #define RFX_WRITE_DELAY 300
  366. --- a/hardware/RFXComTCP.cpp
  367. +++ b/hardware/RFXComTCP.cpp
  368. @@ -1,8 +1,6 @@
  369. #include "stdafx.h"
  370. #include "RFXComTCP.h"
  371. #include "../main/Logger.h"
  372. -//#include <boost/bind.hpp>
  373. -//#include <boost/asio.hpp>
  374. #include "../main/Helper.h"
  375. #include "../main/localtime_r.h"
  376. #include "../main/mainworker.h"
  377. --- a/hardware/Rego6XXSerial.cpp
  378. +++ b/hardware/Rego6XXSerial.cpp
  379. @@ -16,11 +16,13 @@
  380. #include <string>
  381. #include <algorithm>
  382. #include <iostream>
  383. -#include <boost/bind.hpp>
  384. +#include <boost/bind/bind.hpp>
  385. #include "hardwaretypes.h"
  386. #include <ctime>
  387. +using namespace boost::placeholders;
  388. +
  389. #define Rego6XX_RETRY_DELAY 30
  390. #define Rego6XX_COMMAND_DELAY 5
  391. #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1)
  392. --- a/hardware/S0MeterBase.cpp
  393. +++ b/hardware/S0MeterBase.cpp
  394. @@ -13,7 +13,7 @@
  395. #include <string>
  396. #include <algorithm>
  397. #include <iostream>
  398. -#include <boost/bind.hpp>
  399. +#include <boost/bind/bind.hpp>
  400. #include <ctime>
  401. --- a/hardware/S0MeterSerial.cpp
  402. +++ b/hardware/S0MeterSerial.cpp
  403. @@ -8,11 +8,13 @@
  404. #include <algorithm>
  405. #include <ctime>
  406. -#include <boost/bind.hpp>
  407. +#include <boost/bind/bind.hpp>
  408. #include <boost/exception/diagnostic_information.hpp>
  409. #include <iostream>
  410. #include <string>
  411. +using namespace boost::placeholders;
  412. +
  413. #ifdef _DEBUG
  414. //#define DEBUG_S0
  415. #define TOT_DEBUG_LINES 6
  416. --- a/hardware/TCPProxy/tcpproxy_server.cpp
  417. +++ b/hardware/TCPProxy/tcpproxy_server.cpp
  418. @@ -15,6 +15,8 @@
  419. #include "stdafx.h"
  420. #include "tcpproxy_server.h"
  421. +using namespace boost::placeholders;
  422. +
  423. #if BOOST_VERSION >= 107000
  424. #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
  425. #else
  426. --- a/hardware/TeleinfoSerial.cpp
  427. +++ b/hardware/TeleinfoSerial.cpp
  428. @@ -28,9 +28,11 @@ History :
  429. #include "../main/localtime_r.h"
  430. #include "../main/Logger.h"
  431. -#include <boost/bind.hpp>
  432. +#include <boost/bind/bind.hpp>
  433. #include <boost/exception/diagnostic_information.hpp>
  434. +using namespace boost::placeholders;
  435. +
  436. CTeleinfoSerial::CTeleinfoSerial(const int ID, const std::string& devname, const int datatimeout, unsigned int baud_rate, const bool disable_crc, const int ratelimit)
  437. {
  438. m_HwdID = ID;
  439. --- a/hardware/USBtin.cpp
  440. +++ b/hardware/USBtin.cpp
  441. @@ -27,7 +27,7 @@ History :
  442. #include "../main/SQLHelper.h"
  443. #include <algorithm>
  444. -#include <boost/bind.hpp>
  445. +#include <boost/bind/bind.hpp>
  446. #include <boost/exception/diagnostic_information.hpp>
  447. #include <cstdlib>
  448. #include <ctime>
  449. @@ -35,6 +35,8 @@ History :
  450. #include <string>
  451. #include <time.h>
  452. +using namespace boost::placeholders;
  453. +
  454. #define USBTIN_BAUD_RATE 115200
  455. #define USBTIN_PARITY boost::asio::serial_port_base::parity::none
  456. #define USBTIN_CARACTER_SIZE 8
  457. --- a/hardware/XiaomiGateway.cpp
  458. +++ b/hardware/XiaomiGateway.cpp
  459. @@ -12,7 +12,7 @@
  460. #include "XiaomiHardware.h"
  461. #include <openssl/aes.h>
  462. #include <boost/asio.hpp>
  463. -#include <boost/bind.hpp>
  464. +#include <boost/bind/bind.hpp>
  465. #ifndef WIN32
  466. #include <ifaddrs.h>
  467. --- a/hardware/Yeelight.h
  468. +++ b/hardware/Yeelight.h
  469. @@ -2,7 +2,6 @@
  470. #include "DomoticzHardware.h"
  471. #include <boost/asio.hpp>
  472. -#include <boost/bind.hpp>
  473. class Yeelight : public CDomoticzHardwareBase
  474. {
  475. --- a/hardware/ZiBlueSerial.cpp
  476. +++ b/hardware/ZiBlueSerial.cpp
  477. @@ -6,6 +6,8 @@
  478. #include <boost/exception/diagnostic_information.hpp>
  479. +using namespace boost::placeholders;
  480. +
  481. #define ZiBlue_RETRY_DELAY 30
  482. CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) :
  483. --- a/hardware/plugins/PluginTransports.cpp
  484. +++ b/hardware/plugins/PluginTransports.cpp
  485. @@ -13,6 +13,8 @@
  486. #include "icmp_header.hpp"
  487. #include "ipv4_header.hpp"
  488. +using namespace boost::placeholders;
  489. +
  490. namespace Plugins {
  491. void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred)
  492. --- a/main/WebServer.cpp
  493. +++ b/main/WebServer.cpp
  494. @@ -1,7 +1,7 @@
  495. #include "stdafx.h"
  496. #include "WebServer.h"
  497. #include "WebServerHelper.h"
  498. -#include <boost/bind.hpp>
  499. +#include <boost/bind/bind.hpp>
  500. #include <iostream>
  501. #include <fstream>
  502. #include "mainworker.h"
  503. @@ -65,6 +65,8 @@
  504. #define __STDC_FORMAT_MACROS
  505. #include <inttypes.h>
  506. +using namespace boost::placeholders;
  507. +
  508. #define round(a) ( int ) ( a + .5 )
  509. extern std::string szStartupFolder;
  510. --- a/main/mainworker.cpp
  511. +++ b/main/mainworker.cpp
  512. @@ -174,6 +174,8 @@
  513. #include <fstream>
  514. #endif
  515. +using namespace boost::placeholders;
  516. +
  517. #define round(a) ( int ) ( a + .5 )
  518. extern std::string szStartupFolder;
  519. --- a/push/FibaroPush.cpp
  520. +++ b/push/FibaroPush.cpp
  521. @@ -14,6 +14,8 @@
  522. #define __STDC_FORMAT_MACROS
  523. #include <inttypes.h>
  524. +using namespace boost::placeholders;
  525. +
  526. CFibaroPush::CFibaroPush()
  527. {
  528. m_PushType = PushType::PUSHTYPE_FIBARO;
  529. --- a/push/GooglePubSubPush.cpp
  530. +++ b/push/GooglePubSubPush.cpp
  531. @@ -21,6 +21,8 @@ extern "C" {
  532. #include <boost/python.hpp>
  533. #endif
  534. +using namespace boost::placeholders;
  535. +
  536. extern std::string szUserDataFolder;
  537. // this should be filled in by the preprocessor
  538. --- a/push/HttpPush.cpp
  539. +++ b/push/HttpPush.cpp
  540. @@ -15,6 +15,8 @@
  541. #define __STDC_FORMAT_MACROS
  542. #include <inttypes.h>
  543. +using namespace boost::placeholders;
  544. +
  545. CHttpPush::CHttpPush()
  546. {
  547. m_PushType = PushType::PUSHTYPE_HTTP;
  548. --- a/push/InfluxPush.cpp
  549. +++ b/push/InfluxPush.cpp
  550. @@ -15,6 +15,8 @@
  551. #define __STDC_FORMAT_MACROS
  552. #include <inttypes.h>
  553. +using namespace boost::placeholders;
  554. +
  555. CInfluxPush::CInfluxPush() :
  556. m_InfluxPort(8086),
  557. m_bInfluxDebugActive(false)
  558. --- a/push/WebsocketPush.cpp
  559. +++ b/push/WebsocketPush.cpp
  560. @@ -3,6 +3,8 @@
  561. #include "../webserver/WebsocketHandler.h"
  562. #include "../main/mainworker.h"
  563. +using namespace boost::placeholders;
  564. +
  565. 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;
  566. --- a/tcpserver/TCPServer.cpp
  567. +++ b/tcpserver/TCPServer.cpp
  568. @@ -11,7 +11,7 @@
  569. #include "../main/localtime_r.h"
  570. #include <boost/asio.hpp>
  571. #include <algorithm>
  572. -#include <boost/bind.hpp>
  573. +#include <boost/bind/bind.hpp>
  574. namespace tcp {
  575. namespace server {
  576. --- a/webserver/cWebem.cpp
  577. +++ b/webserver/cWebem.cpp
  578. @@ -5,7 +5,7 @@
  579. //Modified, extended etc by Robbert E. Peters/RTSS B.V.
  580. #include "stdafx.h"
  581. #include "cWebem.h"
  582. -#include <boost/bind.hpp>
  583. +#include <boost/bind/bind.hpp>
  584. #include "reply.hpp"
  585. #include "request.hpp"
  586. #include "mime_types.hpp"
  587. --- a/webserver/connection.cpp
  588. +++ b/webserver/connection.cpp
  589. @@ -9,7 +9,7 @@
  590. //
  591. #include "stdafx.h"
  592. #include "connection.hpp"
  593. -#include <boost/bind.hpp>
  594. +#include <boost/bind/bind.hpp>
  595. #include <boost/algorithm/string.hpp>
  596. #include "connection_manager.hpp"
  597. #include "request_handler.hpp"
  598. @@ -17,6 +17,8 @@
  599. #include "../main/localtime_r.h"
  600. #include "../main/Logger.h"
  601. +using namespace boost::placeholders;
  602. +
  603. namespace http {
  604. namespace server {
  605. extern std::string convert_to_http_date(time_t time);
  606. --- a/webserver/connection_manager.cpp
  607. +++ b/webserver/connection_manager.cpp
  608. @@ -10,10 +10,12 @@
  609. #include "stdafx.h"
  610. #include "connection_manager.hpp"
  611. #include <algorithm>
  612. -#include <boost/bind.hpp>
  613. +#include <boost/bind/bind.hpp>
  614. #include <iostream>
  615. #include "../main/Logger.h"
  616. +using namespace boost::placeholders;
  617. +
  618. namespace http {
  619. namespace server {
  620. --- a/webserver/proxyclient.cpp
  621. +++ b/webserver/proxyclient.cpp
  622. @@ -8,6 +8,8 @@
  623. #include "../tcpserver/TCPServer.h"
  624. #include "sha1.hpp"
  625. +using namespace boost::placeholders;
  626. +
  627. // RK: some defines to make mydomoticz also work when openssl not compiled in
  628. #ifdef WWW_ENABLE_SSL
  629. #define PROXY_PORT 443
  630. --- a/webserver/server.cpp
  631. +++ b/webserver/server.cpp
  632. @@ -3,7 +3,7 @@
  633. // ~~~~~~~~~~
  634. //
  635. #include "stdafx.h"
  636. -#include <boost/bind.hpp>
  637. +#include <boost/bind/bind.hpp>
  638. #include "server.hpp"
  639. #include <fstream>
  640. #include "../main/Logger.h"
  641. @@ -11,6 +11,8 @@
  642. #include "../main/localtime_r.h"
  643. #include "../main/mainworker.h"
  644. +using namespace boost::placeholders;
  645. +
  646. extern bool g_bIsWSL;
  647. namespace http {