Removed MAINTAIN_BACKWARDS_COMPATIBILITY_562 (Issue 70)

1 files changed, 6 insertions, 12 deletions

diff --git a/eprecomp.h b/eprecomp.h
index cf44ce6c..611f4f21 100644
--- a/eprecomp.h
+++ b/eprecomp.h
@@ -19,16 +19,14 @@ class DL_GroupPrecomputation
 public:

 	typedef T Element;

 

+	virtual ~DL_GroupPrecomputation() {}

+

 	virtual bool NeedConversions() const {return false;}

 	virtual Element ConvertIn(const Element &v) const {return v;}

 	virtual Element ConvertOut(const Element &v) const {return v;}

 	virtual const AbstractGroup<Element> & GetGroup() const =0;

 	virtual Element BERDecodeElement(BufferedTransformation &bt) const =0;

 	virtual void DEREncodeElement(BufferedTransformation &bt, const Element &P) const =0;

-

-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

-	virtual ~DL_GroupPrecomputation() {}

-#endif

 };

 

 template <class T>

@@ -37,6 +35,8 @@ class DL_FixedBasePrecomputation
 public:

 	typedef T Element;

 

+	virtual ~DL_FixedBasePrecomputation() {}

+

 	virtual bool IsInitialized() const =0;

 	virtual void SetBase(const DL_GroupPrecomputation<Element> &group, const Element &base) =0;

 	virtual const Element & GetBase(const DL_GroupPrecomputation<Element> &group) const =0;

@@ -45,10 +45,6 @@ public:
 	virtual void Save(const DL_GroupPrecomputation<Element> &group, BufferedTransformation &storedPrecomputation) const =0;

 	virtual Element Exponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent) const =0;

 	virtual Element CascadeExponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent, const DL_FixedBasePrecomputation<Element> &pc2, const Integer &exponent2) const =0;

-

-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

-	virtual ~DL_FixedBasePrecomputation() {}

-#endif

 };

 

 template <class T>

@@ -57,6 +53,8 @@ class DL_FixedBasePrecomputationImpl : public DL_FixedBasePrecomputation<T>
 public:

 	typedef T Element;

 

+	virtual ~DL_FixedBasePrecomputationImpl() {}

+

 	DL_FixedBasePrecomputationImpl() : m_windowSize(0) {}

 

 	// DL_FixedBasePrecomputation

@@ -71,10 +69,6 @@ public:
 	Element Exponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent) const;

 	Element CascadeExponentiate(const DL_GroupPrecomputation<Element> &group, const Integer &exponent, const DL_FixedBasePrecomputation<Element> &pc2, const Integer &exponent2) const;

 

-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562

-	virtual ~DL_FixedBasePrecomputationImpl() {}

-#endif

-

 private:

 	void PrepareCascade(const DL_GroupPrecomputation<Element> &group, std::vector<BaseAndExponent<Element> > &eb, const Integer &exponent) const;