qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject [qpid-cpp] 07/10: QPID-8325: Fix synthesised inherited operator= deprecation warnings
Date Wed, 19 Jun 2019 13:52:15 GMT
This is an automated email from the ASF dual-hosted git repository.

astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git

commit 5446ba36f8e8b39c735254c0b787422e3f76db3e
Author: Andrew Stitcher <astitcher@apache.org>
AuthorDate: Fri Jun 14 02:26:15 2019 -0400

    QPID-8325: Fix synthesised inherited operator= deprecation warnings
---
 src/qpid/InlineVector.h              |  5 +++++
 src/qpid/framing/ProtocolVersion.cpp |  7 -------
 src/qpid/framing/ProtocolVersion.h   |  2 --
 src/qpid/sys/ssl/util.cpp            | 11 +----------
 src/qpid/sys/ssl/util.h              |  1 -
 5 files changed, 6 insertions(+), 20 deletions(-)

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 @@ class InlineVector : public std::vector<T, InlineAllocator<Alloc,
Max> >
         this->reserve(std::max(x.size(), Max));
         *this = x;
     }
+
+    InlineVector& operator=(const InlineVector& x) {
+        this->Base::operator=(x);
+        return *this;
+    }
 };
 
 } // namespace qpid
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 @@ const std::string ProtocolVersion::toString() const
     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_;
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 @@ public:
     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;
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 @@ SslOptions::SslOptions() : qpid::Options("SSL Settings"),
         ("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?
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 @@ struct SslOptions : qpid::Options
     bool exportPolicy;
 
     SslOptions();
-    SslOptions& operator=(const SslOptions&);
 };
 
 void initNSS(const SslOptions& options, bool server = false);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message