From 445ec61125d1aab1151ea248d2c22ac90f361094 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 1 Jul 2019 13:29:46 -0400 Subject: [PATCH] Remove copy ctor from DERGeneralEncoder and BERGeneralDecoder GCC was giving too many warnings at -Wextra. We also could not comply with Rule of 3 because it resulted in compile failures in C++98 and C++03 --- asn.cpp | 11 ----------- asn.h | 14 ++------------ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/asn.cpp b/asn.cpp index 1631f52e..ed4ac82f 100644 --- a/asn.cpp +++ b/asn.cpp @@ -406,12 +406,6 @@ BERGeneralDecoder::BERGeneralDecoder(BufferedTransformation &inQueue, byte asnTa Init(asnTag); } -BERGeneralDecoder::BERGeneralDecoder(BERGeneralDecoder &inQueue) - : m_inQueue(inQueue), m_length(0), m_finished(false) -{ - Init(DefaultTag); -} - BERGeneralDecoder::BERGeneralDecoder(BERGeneralDecoder &inQueue, byte asnTag) : m_inQueue(inQueue), m_length(0), m_finished(false) { @@ -523,11 +517,6 @@ DERGeneralEncoder::DERGeneralEncoder(BufferedTransformation &outQueue, byte asnT { } -DERGeneralEncoder::DERGeneralEncoder(DERGeneralEncoder &outQueue) - : m_outQueue(outQueue), m_asnTag(DefaultTag), m_finished(false) -{ -} - DERGeneralEncoder::DERGeneralEncoder(DERGeneralEncoder &outQueue, byte asnTag) : m_outQueue(outQueue), m_asnTag(asnTag), m_finished(false) { diff --git a/asn.h b/asn.h index c1f262a7..b31f3dfd 100644 --- a/asn.h +++ b/asn.h @@ -255,7 +255,7 @@ private: }; /// \brief BER General Decoder -class CRYPTOPP_DLL BERGeneralDecoder : public Store, NotCopyable +class CRYPTOPP_DLL BERGeneralDecoder : public Store { public: /// \brief Default ASN.1 tag @@ -273,11 +273,6 @@ public: /// \param asnTag ASN.1 tag explicit BERGeneralDecoder(BufferedTransformation &inQueue, byte asnTag); - /// \brief Construct an ASN.1 decoder - /// \param inQueue input byte queue - /// \details BERGeneralDecoder uses DefaultTag - explicit BERGeneralDecoder(BERGeneralDecoder &inQueue); - /// \brief Construct an ASN.1 decoder /// \param inQueue input byte queue /// \param asnTag ASN.1 tag @@ -371,7 +366,7 @@ private: }; /// \brief DER General Encoder -class CRYPTOPP_DLL DERGeneralEncoder : public ByteQueue, NotCopyable +class CRYPTOPP_DLL DERGeneralEncoder : public ByteQueue { public: /// \brief Default ASN.1 tag @@ -389,11 +384,6 @@ public: /// \param asnTag ASN.1 tag explicit DERGeneralEncoder(BufferedTransformation &outQueue, byte asnTag); - /// \brief Construct an ASN.1 encoder - /// \param outQueue output byte queue - /// \details DERGeneralEncoder uses DefaultTag - explicit DERGeneralEncoder(DERGeneralEncoder &outQueue); - /// \brief Construct an ASN.1 encoder /// \param outQueue output byte queue /// \param asnTag ASN.1 tag