Merge pull request #9070 from rgacogne/boost-173

Boost 1.73 moved boost::bind placeholders to the placeholders namespace

diff --combined pdns/ws-auth.cc
index f8a3280e64f372589ecc889348bf7875dbd038c8,c3ca5c29aec277b24ad13995b7ae6c832b5e9ae8..de5fa008405e1a019be87da67208bb0fec535081
--- 1/pdns/ws-auth.cc
--- 2/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@@ -62,6 -62,7 +62,6 @@@ static const std::set<uint16_t> onlyOne
  static const std::set<uint16_t> exclusiveEntryTypes = { QType::CNAME };
  
  AuthWebServer::AuthWebServer() :
 -  d_tid(0),
    d_start(time(nullptr)),
    d_min10(0),
    d_min5(0),
@@@ -86,10 -87,8 +86,10 @@@
  void AuthWebServer::go()
  {
    S.doRings();
 -  pthread_create(&d_tid, 0, webThreadHelper, this);
 -  pthread_create(&d_tid, 0, statThreadHelper, this);
 +  std::thread webT(std::bind(&AuthWebServer::webThread, this));
 +  webT.detach();
 +  std::thread statT(std::bind(&AuthWebServer::statThread, this));
 +  statT.detach();
  }
  
  void AuthWebServer::statThread()
@@@ -111,6 -110,20 +111,6 @@@
    }
  }
  
 -void *AuthWebServer::statThreadHelper(void *p)
 -{
 -  AuthWebServer *self=static_cast<AuthWebServer *>(p);
 -  self->statThread();
 -  return 0; // never reached
 -}
 -
 -void *AuthWebServer::webThreadHelper(void *p)
 -{
 -  AuthWebServer *self=static_cast<AuthWebServer *>(p);
 -  self->webThread();
 -  return 0; // never reached
 -}
 -
  static string htmlescape(const string &s) {
    string result;
    for(string::const_iterator it=s.begin(); it!=s.end(); ++it) {
@@@ -2184,7 -2197,7 +2184,7 @@@ static void apiServerSearchData(HttpReq
  
    B.getAllDomains(&domains, true);
  
 -  for(const DomainInfo di: domains)
 +  for(const DomainInfo& di: domains)
    {
      if ((objectType == ObjectType::ALL || objectType == ObjectType::ZONE) && ents < maxEnts && sm.match(di.zone)) {
        doc.push_back(Json::object {
@@@ -2315,8 -2328,8 +2315,8 @@@ void AuthWebServer::webThread(
        d_ws->registerApiHandler("/api", &apiDiscovery);
      }
      if (::arg().mustDo("webserver")) {
-       d_ws->registerWebHandler("/style.css", boost::bind(&AuthWebServer::cssfunction, this, _1, _2));
-       d_ws->registerWebHandler("/", boost::bind(&AuthWebServer::indexfunction, this, _1, _2));
+       d_ws->registerWebHandler("/style.css", std::bind(&AuthWebServer::cssfunction, this, std::placeholders::_1, std::placeholders::_2));
+       d_ws->registerWebHandler("/", std::bind(&AuthWebServer::indexfunction, this, std::placeholders::_1, std::placeholders::_2));
      }
      d_ws->go();
    }