From: Remi Gacogne <rgacogne@users.noreply.github.com>
Date: Mon, 20 May 2019 12:27:06 +0000 (+0200)
Subject: Merge pull request #7622 from shane-kerr/dnsdist-lua-actions-std-string
X-Git-Tag: rec-4.2.0-rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=292750b58a7fcc9e1f48da8397a12cbc0a560abc;p=thirdparty%2Fpdns.git

Merge pull request #7622 from shane-kerr/dnsdist-lua-actions-std-string

Change all occurrences of string to std::string
---

292750b58a7fcc9e1f48da8397a12cbc0a560abc
diff --cc pdns/dnsdist-lua-actions.cc
index c9cadfc5ee,720eb5ee2d..2943ad3189
--- a/pdns/dnsdist-lua-actions.cc
+++ b/pdns/dnsdist-lua-actions.cc
@@@ -745,10 -739,10 +745,10 @@@ private
  class DnstapLogAction : public DNSAction, public boost::noncopyable
  {
  public:
 -  DnstapLogAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSQuestion&, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
 +  DnstapLogAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(DNSQuestion*, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
    {
    }
-   DNSAction::Action operator()(DNSQuestion* dq, string* ruleresult) const override
+   DNSAction::Action operator()(DNSQuestion* dq, std::string* ruleresult) const override
    {
  #ifdef HAVE_PROTOBUF
      DnstapMessage message(d_identity, dq->remote, dq->local, dq->tcp, reinterpret_cast<const char*>(dq->dh), dq->len, dq->queryTime, nullptr);
@@@ -777,10 -771,10 +777,10 @@@ private
  class RemoteLogAction : public DNSAction, public boost::noncopyable
  {
  public:
 -  RemoteLogAction(std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSQuestion&, DNSDistProtoBufMessage*)> > alterFunc, const std::string& serverID): d_logger(logger), d_alterFunc(alterFunc), d_serverID(serverID)
 +  RemoteLogAction(std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(DNSQuestion*, DNSDistProtoBufMessage*)> > alterFunc, const std::string& serverID, const std::string& ipEncryptKey): d_logger(logger), d_alterFunc(alterFunc), d_serverID(serverID), d_ipEncryptKey(ipEncryptKey)
    {
    }
-   DNSAction::Action operator()(DNSQuestion* dq, string* ruleresult) const override
+   DNSAction::Action operator()(DNSQuestion* dq, std::string* ruleresult) const override
    {
  #ifdef HAVE_PROTOBUF
      if (!dq->uniqueId) {
@@@ -871,10 -857,10 +871,10 @@@ private
  class DnstapLogResponseAction : public DNSResponseAction, public boost::noncopyable
  {
  public:
 -  DnstapLogResponseAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSResponse&, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
 +  DnstapLogResponseAction(const std::string& identity, std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(DNSResponse*, DnstapMessage*)> > alterFunc): d_identity(identity), d_logger(logger), d_alterFunc(alterFunc)
    {
    }
-   DNSResponseAction::Action operator()(DNSResponse* dr, string* ruleresult) const override
+   DNSResponseAction::Action operator()(DNSResponse* dr, std::string* ruleresult) const override
    {
  #ifdef HAVE_PROTOBUF
      struct timespec now;
@@@ -905,10 -891,10 +905,10 @@@ private
  class RemoteLogResponseAction : public DNSResponseAction, public boost::noncopyable
  {
  public:
 -  RemoteLogResponseAction(std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(const DNSResponse&, DNSDistProtoBufMessage*)> > alterFunc, const std::string& serverID, bool includeCNAME): d_logger(logger), d_alterFunc(alterFunc), d_serverID(serverID), d_includeCNAME(includeCNAME)
 +  RemoteLogResponseAction(std::shared_ptr<RemoteLoggerInterface>& logger, boost::optional<std::function<void(DNSResponse*, DNSDistProtoBufMessage*)> > alterFunc, const std::string& serverID, const std::string& ipEncryptKey, bool includeCNAME): d_logger(logger), d_alterFunc(alterFunc), d_serverID(serverID), d_ipEncryptKey(ipEncryptKey), d_includeCNAME(includeCNAME)
    {
    }
-   DNSResponseAction::Action operator()(DNSResponse* dr, string* ruleresult) const override
+   DNSResponseAction::Action operator()(DNSResponse* dr, std::string* ruleresult) const override
    {
  #ifdef HAVE_PROTOBUF
      if (!dr->uniqueId) {