From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 29 Dec 2014 13:14:16 +0000 (+0100)
Subject: More aggressive workaround attempt
X-Git-Tag: merge-candidate-3-v1~410^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7df80fc5540105858bc8749fdd13937ed6dfd7de;p=thirdparty%2Fsquid.git

More aggressive workaround attempt
---

diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc
index a56ff0a6e8..390ddf42df 100644
--- a/helpers/basic_auth/MSNT/msntauth.cc
+++ b/helpers/basic_auth/MSNT/msntauth.cc
@@ -59,11 +59,12 @@ struct domaincontroller {
     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)
     {}
-#if 0 && __cplusplus >= 201103L
-    // disable move constructor to work around centos-6 clang bug
     domaincontroller (domaincontroller &&) = delete;
 #endif
 };