commit 5446ba36f8e8b39c735254c0b787422e3f76db3e
author Andrew Stitcher <astitcher@apache.org> Fri Jun 14 02:26:15 2019 -0400
committer Andrew Stitcher <astitcher@apache.org> Wed Jun 19 09:40:26 2019 -0400
tree 19628c741bd44b9bfd6ae726380371623e002a5c
parent 500af4f89f5f17cfa9a72b7737bea3734b430c9f

QPID-8325: Fix synthesised inherited operator= deprecation warnings

src/qpid/InlineVector.h

diff --git a/src/qpid/InlineVector.h b/src/qpid/InlineVector.h
index c55db29..cba9490 100644
--- a/src/qpid/InlineVector.h
+++ b/src/qpid/InlineVector.h
@@ -61,6 +61,11 @@
         this->reserve(std::max(x.size(), Max));
         *this = x;
     }
+
+    InlineVector& operator=(const InlineVector& x) {
+        this->Base::operator=(x);
+        return *this;
+    }
 };
 
 } // namespace qpid

src/qpid/framing/ProtocolVersion.cpp

diff --git a/src/qpid/framing/ProtocolVersion.cpp b/src/qpid/framing/ProtocolVersion.cpp
index 269b861..1f35f6f 100644
--- a/src/qpid/framing/ProtocolVersion.cpp
+++ b/src/qpid/framing/ProtocolVersion.cpp
@@ -34,13 +34,6 @@
     return ss.str();
 }
 
-ProtocolVersion& ProtocolVersion::operator=(ProtocolVersion p)
-{
-    major_ = p.major_;
-    minor_ = p.minor_;
-    return *this;
-}
-
 bool ProtocolVersion::operator==(ProtocolVersion p) const
 {
     return major_ == p.major_ && minor_ == p.minor_;

src/qpid/framing/ProtocolVersion.h

diff --git a/src/qpid/framing/ProtocolVersion.h b/src/qpid/framing/ProtocolVersion.h
index 92580ba..76e342b 100644
--- a/src/qpid/framing/ProtocolVersion.h
+++ b/src/qpid/framing/ProtocolVersion.h
@@ -50,8 +50,6 @@
     QPID_COMMON_INLINE_EXTERN void setProtocol(uint8_t protocol) { protocol_ = protocol; }
     QPID_COMMON_EXTERN const std::string toString() const;
 
-    QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p);
-
     QPID_COMMON_EXTERN bool operator==(ProtocolVersion p) const;
     QPID_COMMON_INLINE_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); }
     QPID_COMMON_EXTERN static const uint8_t AMQP;

src/qpid/sys/ssl/util.cpp

diff --git a/src/qpid/sys/ssl/util.cpp b/src/qpid/sys/ssl/util.cpp
index e527606..93f22e7 100644
--- a/src/qpid/sys/ssl/util.cpp
+++ b/src/qpid/sys/ssl/util.cpp
@@ -59,16 +59,7 @@
         ("ssl-cert-name", optValue(certName, "NAME"), "Name of the certificate to use");
 }
 
-SslOptions& SslOptions::operator=(const SslOptions& o) 
-{
-    certDbPath = o.certDbPath;
-    certName = o.certName;
-    certPasswordFile = o.certPasswordFile;
-    exportPolicy = o.exportPolicy;
-    return *this;
-}
-
-char* promptForPassword(PK11SlotInfo*, PRBool retry, void*) 
+char* promptForPassword(PK11SlotInfo*, PRBool retry, void*)
 {
     if (retry) return 0;
     //TODO: something else?

src/qpid/sys/ssl/util.h

diff --git a/src/qpid/sys/ssl/util.h b/src/qpid/sys/ssl/util.h
index f34adab..65a60f6 100644
--- a/src/qpid/sys/ssl/util.h
+++ b/src/qpid/sys/ssl/util.h
@@ -39,7 +39,6 @@
     bool exportPolicy;
 
     SslOptions();
-    SslOptions& operator=(const SslOptions&);
 };
 
 void initNSS(const SslOptions& options, bool server = false);