From 566e222bca7caddc66602bb3896c256fa4ca6094 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Fri, 2 Jan 2015 12:26:14 -0800
Subject: [PATCH] Bug 1117003 - Backout cset ca3c73188295 (Bug 1115903, Part
 2), r=ehsan

---
 security/pkix/include/pkix/Input.h             |  8 ++++----
 security/pkix/include/pkix/ScopedPtr.h         |  4 ++--
 security/pkix/include/pkix/bind.h              | 12 ++++++------
 security/pkix/include/pkix/pkixtypes.h         | 18 ++++++++++--------
 security/pkix/lib/pkixbuild.cpp                |  4 ++--
 security/pkix/lib/pkixocsp.cpp                 |  5 +++--
 security/pkix/lib/pkixutil.h                   |  8 ++++----
 .../pkixocsp_VerifyEncodedOCSPResponse.cpp     |  5 +++--
 security/pkix/test/lib/pkixtestutil.h          |  4 ++--
 9 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/security/pkix/include/pkix/Input.h b/security/pkix/include/pkix/Input.h
index b05a21476f33..7399a7612eee 100644
--- a/security/pkix/include/pkix/Input.h
+++ b/security/pkix/include/pkix/Input.h
@@ -124,7 +124,7 @@ private:
   const uint8_t* data;
   size_t len;
 
-  void operator=(const Input&) = delete; // Use Init instead.
+  void operator=(const Input&) /* = delete */; // Use Init instead.
 };
 
 inline bool
@@ -291,7 +291,7 @@ public:
     Mark(const Reader& input, const uint8_t* mark) : input(input), mark(mark) { }
     const Reader& input;
     const uint8_t* const mark;
-    void operator=(const Mark&) = delete;
+    void operator=(const Mark&) /* = delete */;
   };
 
   Mark GetMark() const { return Mark(*this, input); }
@@ -320,8 +320,8 @@ private:
   const uint8_t* input;
   const uint8_t* end;
 
-  Reader(const Reader&) = delete;
-  void operator=(const Reader&) = delete;
+  Reader(const Reader&) /* = delete */;
+  void operator=(const Reader&) /* = delete */;
 };
 
 inline bool
diff --git a/security/pkix/include/pkix/ScopedPtr.h b/security/pkix/include/pkix/ScopedPtr.h
index cd21d63afd7e..b28ee3519943 100644
--- a/security/pkix/include/pkix/ScopedPtr.h
+++ b/security/pkix/include/pkix/ScopedPtr.h
@@ -69,8 +69,8 @@ public:
 protected:
   T* mValue;
 
-  ScopedPtr(const ScopedPtr&) = delete;
-  void operator=(const ScopedPtr&) = delete;
+  ScopedPtr(const ScopedPtr&) /* = delete */;
+  void operator=(const ScopedPtr&) /* = delete */;
 };
 
 template <typename T, void(&Destroyer)(T*)>
diff --git a/security/pkix/include/pkix/bind.h b/security/pkix/include/pkix/bind.h
index db13deec376b..ed9174cf52cd 100644
--- a/security/pkix/include/pkix/bind.h
+++ b/security/pkix/include/pkix/bind.h
@@ -80,7 +80,7 @@ public:
 private:
   F f;
   B1& b1;
-  void operator=(const Bind1&) = delete;
+  void operator=(const Bind1&) /*= delete*/;
 };
 
 template <typename R, typename P1, typename B1, typename B2>
@@ -94,7 +94,7 @@ private:
   F f;
   B1& b1;
   B2& b2;
-  void operator=(const Bind2&) = delete;
+  void operator=(const Bind2&) /*= delete*/;
 };
 
 template <typename R, typename P1, typename B1, typename B2, typename B3>
@@ -110,7 +110,7 @@ private:
   B1& b1;
   B2& b2;
   B3& b3;
-  void operator=(const Bind3&) = delete;
+  void operator=(const Bind3&) /*= delete*/;
 };
 
 template <typename R, typename P1, typename B1, typename B2, typename B3,
@@ -128,7 +128,7 @@ private:
   B2& b2;
   B3& b3;
   B4& b4;
-  void operator=(const Bind4&) = delete;
+  void operator=(const Bind4&) /*= delete*/;
 };
 
 template <typename R, typename C1, typename P1, typename P2, typename P3,
@@ -148,7 +148,7 @@ public:
 private:
   const F f;
   C1& that;
-  void operator=(const BindToMemberFunction4&) = delete;
+  void operator=(const BindToMemberFunction4&) /*= delete*/;
 };
 
 template <typename R, typename P1, typename B1, typename B2, typename B3,
@@ -167,7 +167,7 @@ private:
   B3 b3;
   B4 b4;
   B5 b5;
-  void operator=(const Bind5&) = delete;
+  void operator=(const Bind5&) /*= delete*/;
 };
 
 } // namespace internal
diff --git a/security/pkix/include/pkix/pkixtypes.h b/security/pkix/include/pkix/pkixtypes.h
index fb0b98419fe3..d417f4089936 100644
--- a/security/pkix/include/pkix/pkixtypes.h
+++ b/security/pkix/include/pkix/pkixtypes.h
@@ -80,7 +80,8 @@ public:
   SignatureAlgorithm algorithm;
   Input signature;
 
-  void operator=(const SignedDataWithSignature&) = delete;
+private:
+  void operator=(const SignedDataWithSignature&) /*= delete*/;
 };
 
 MOZILLA_PKIX_ENUM_CLASS EndEntityOrCA { MustBeEndEntity = 0, MustBeCA = 1 };
@@ -147,8 +148,8 @@ public:
   const Input issuer;
   const Input issuerSubjectPublicKeyInfo;
   const Input serialNumber;
-
-  void operator=(const CertID&) = delete;
+private:
+  void operator=(const CertID&) /*= delete*/;
 };
 
 class DERArray
@@ -208,9 +209,9 @@ public:
   protected:
     IssuerChecker();
     virtual ~IssuerChecker();
-
-    IssuerChecker(const IssuerChecker&) = delete;
-    void operator=(const IssuerChecker&) = delete;
+  private:
+    IssuerChecker(const IssuerChecker&) /*= delete*/;
+    void operator=(const IssuerChecker&) /*= delete*/;
   };
 
   // Search for a CA certificate with the given name. The implementation must
@@ -324,8 +325,9 @@ public:
 protected:
   TrustDomain() { }
 
-  TrustDomain(const TrustDomain&) = delete;
-  void operator=(const TrustDomain&) = delete;
+private:
+  TrustDomain(const TrustDomain&) /* = delete */;
+  void operator=(const TrustDomain&) /* = delete */;
 };
 
 } } // namespace mozilla::pkix
diff --git a/security/pkix/lib/pkixbuild.cpp b/security/pkix/lib/pkixbuild.cpp
index 195a7c88c6d6..ef66d62a3404 100644
--- a/security/pkix/lib/pkixbuild.cpp
+++ b/security/pkix/lib/pkixbuild.cpp
@@ -84,8 +84,8 @@ private:
   Result result;
   bool resultWasSet;
 
-  PathBuildingStep(const PathBuildingStep&) = delete;
-  void operator=(const PathBuildingStep&) = delete;
+  PathBuildingStep(const PathBuildingStep&) /*= delete*/;
+  void operator=(const PathBuildingStep&) /*= delete*/;
 };
 
 Result
diff --git a/security/pkix/lib/pkixocsp.cpp b/security/pkix/lib/pkixocsp.cpp
index 759775cfcdc7..9f29f2eaadad 100644
--- a/security/pkix/lib/pkixocsp.cpp
+++ b/security/pkix/lib/pkixocsp.cpp
@@ -71,8 +71,9 @@ public:
   Time* validThrough;
   bool expired;
 
-  Context(const Context&) = delete;
-  void operator=(const Context&) = delete;
+private:
+  Context(const Context&); // delete
+  void operator=(const Context&); // delete
 };
 
 // Verify that potentialSigner is a valid delegated OCSP response signing cert
diff --git a/security/pkix/lib/pkixutil.h b/security/pkix/lib/pkixutil.h
index 8c95fd04d3b6..745c8de1a83c 100644
--- a/security/pkix/lib/pkixutil.h
+++ b/security/pkix/lib/pkixutil.h
@@ -143,8 +143,8 @@ private:
   Result RememberExtension(Reader& extnID, const Input& extnValue,
                            bool critical, /*out*/ bool& understood);
 
-  BackCert(const BackCert&) = delete;
-  void operator=(const BackCert&) = delete;
+  BackCert(const BackCert&) /* = delete */;
+  void operator=(const BackCert&); /* = delete */;
 };
 
 class NonOwningDERArray : public DERArray
@@ -183,8 +183,8 @@ private:
   Input items[MAX_LENGTH]; // avoids any heap allocations
   size_t numItems;
 
-  NonOwningDERArray(const NonOwningDERArray&) = delete;
-  void operator=(const NonOwningDERArray&) = delete;
+  NonOwningDERArray(const NonOwningDERArray&) /* = delete*/;
+  void operator=(const NonOwningDERArray&) /* = delete*/;
 };
 
 inline unsigned int
diff --git a/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp b/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
index 5ee9fdc14233..6d2a2e66dbb7 100644
--- a/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
+++ b/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
@@ -86,8 +86,9 @@ public:
     return TestCheckPublicKey(subjectPublicKeyInfo);
   }
 
-  OCSPTestTrustDomain(const OCSPTestTrustDomain&) = delete;
-  void operator=(const OCSPTestTrustDomain&) = delete;
+private:
+  OCSPTestTrustDomain(const OCSPTestTrustDomain&) /*delete*/;
+  void operator=(const OCSPTestTrustDomain&) /*delete*/;
 };
 
 namespace {
diff --git a/security/pkix/test/lib/pkixtestutil.h b/security/pkix/test/lib/pkixtestutil.h
index 5ecaf6661082..21c1cf9a3757 100644
--- a/security/pkix/test/lib/pkixtestutil.h
+++ b/security/pkix/test/lib/pkixtestutil.h
@@ -247,8 +247,8 @@ protected:
   {
   }
 
-  TestKeyPair(const TestKeyPair&) = delete;
-  void operator=(const TestKeyPair&) = delete;
+  TestKeyPair(const TestKeyPair&) /*= delete*/;
+  void operator=(const TestKeyPair&) /*= delete*/;
 };
 
 TestKeyPair* CloneReusedKeyPair();