From 90b5dc9e61fdd40181112a9fd52b47dcca5520be Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 19 Jul 2015 10:24:10 -0400 Subject: [PATCH] Cleared remaining virtual destructor warnings under GCC with -Wall --- gfpcrypt.h | 6 ++++-- nbtheory.cpp | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gfpcrypt.h b/gfpcrypt.h index 69cbd88f..2e6549ef 100644 --- a/gfpcrypt.h +++ b/gfpcrypt.h @@ -25,6 +25,8 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE DL_GroupParameters_IntegerBased : public A typedef DL_GroupParameters_IntegerBased ThisClass; public: + virtual ~DL_GroupParameters_IntegerBased() { } + void Initialize(const DL_GroupParameters_IntegerBased ¶ms) {Initialize(params.GetModulus(), params.GetSubgroupOrder(), params.GetSubgroupGenerator());} void Initialize(RandomNumberGenerator &rng, unsigned int pbits) @@ -87,7 +89,7 @@ class CRYPTOPP_NO_VTABLE DL_GroupParameters_IntegerBasedImpl : public DL_GroupPa public: typedef typename GROUP_PRECOMP::Element Element; - virtual DL_GroupParameters_IntegerBasedImpl() { } + virtual ~DL_GroupParameters_IntegerBasedImpl() { } // GeneratibleCryptoMaterial interface bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const @@ -120,7 +122,7 @@ CRYPTOPP_DLL_TEMPLATE_CLASS DL_GroupParameters_IntegerBasedImpl { public: - virtual ~DL_GroupParameters_IntegerBasedImpl() { } + virtual ~DL_GroupParameters_GFP() { } // DL_GroupParameters bool IsIdentity(const Integer &element) const {return element == Integer::One();} diff --git a/nbtheory.cpp b/nbtheory.cpp index 3fdea4e6..0334cf58 100644 --- a/nbtheory.cpp +++ b/nbtheory.cpp @@ -308,7 +308,8 @@ PrimeSieve::PrimeSieve(const Integer &first, const Integer &last, const Integer bool PrimeSieve::NextCandidate(Integer &c) { bool safe = SafeConvert(std::find(m_sieve.begin()+m_next, m_sieve.end(), false) - m_sieve.begin(), m_next); - assert(safe); + assert(safe); CRYPTOPP_UNUSED(safe); + if (m_next == m_sieve.size()) { m_first += long(m_sieve.size())*m_step;