From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 29 Dec 2014 16:32:29 +0000 (+0100)
Subject: Reverted move-constructor-related changes
X-Git-Tag: merge-candidate-3-v1~410^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee0ef6b3075d90b85e091e358f2ae2291abcae30;p=thirdparty%2Fsquid.git

Reverted move-constructor-related changes
---

diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc
index 27d4b9a92d..848660932d 100644
--- a/helpers/basic_auth/MSNT/msntauth.cc
+++ b/helpers/basic_auth/MSNT/msntauth.cc
@@ -56,25 +56,6 @@ static char msntauth_version[] = "Msntauth v3.0.0 (C) 2 Sep 2001 Stellar-X Anton
 struct domaincontroller {
     std::string domain;
     std::string server;
-    domaincontroller(const std::string &d, const std::string & s) :
-        domain(d), server(s)
-    {}
-#if __cplusplus >= 201103L
-    // disable move constructor to work around centos-6 clang bug
-    // this is not a performance-critical functionality anyway
-    domaincontroller (const domaincontroller &d) :
-        domain(d.domain), server(d.server)
-    {}
-    domaincontroller (domaincontroller &&) = delete;
-    domaincontroller()
-    {}
-    domaincontroller& operator = (const domaincontroller &d)
-    {
-        domain=d.domain;
-        server=d.server;
-        return *this;
-    }
-#endif
 };
 typedef std::vector<domaincontroller> domaincontrollers_t;
 domaincontrollers_t domaincontrollers;
@@ -120,7 +101,9 @@ main(int argc, char **argv)
             std::cerr << "Error: can't understand domain controller specification '"
                       << arg << "'. Ignoring" << std::endl;
         }
-        domaincontroller dc(arg.substr(0,pos), arg.substr(pos+1));
+        domaincontroller dc;
+        dc.domain = arg.substr(0,pos);
+        dc.server = arg.substr(pos+1);
         if (dc.domain.length() == 0 || dc.server.length() == 0) {
             std::cerr << "Error: invalid domain specification in '" << arg <<
                       "'. Ignoring." << std::endl;