From 7e318f666c592a98afa3ea15a654ebe6c0bc726e Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 10 Nov 2009 05:26:16 +0000 Subject: Make set_all_values in {ECDSA,ECKAEG}_{Public,Private}Key all non-virtual; virtual-ness not needed, and was overriding/overloading by argument which doesn't actually work in C++ and only happened to work because it was only ever used with the version implemented in that same class. ICC was warning, too. Make non-virtual. --- src/pubkey/ecdsa/ecdsa.h | 5 ++--- src/pubkey/eckaeg/eckaeg.h | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/pubkey') diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h index 379445777..a6a77f3e6 100644 --- a/src/pubkey/ecdsa/ecdsa.h +++ b/src/pubkey/ecdsa/ecdsa.h @@ -85,7 +85,7 @@ class BOTAN_DLL ECDSA_PublicKey : public virtual EC_PublicKey, protected: void X509_load_hook(); - virtual void set_all_values(const ECDSA_PublicKey& other); + void set_all_values(const ECDSA_PublicKey& other); ECDSA_Core m_ecdsa_core; }; @@ -134,9 +134,8 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey, */ virtual void affirm_init() const; - protected: - virtual void set_all_values(const ECDSA_PrivateKey& other); private: + void set_all_values(const ECDSA_PrivateKey& other); void PKCS8_load_hook(bool = false); }; diff --git a/src/pubkey/eckaeg/eckaeg.h b/src/pubkey/eckaeg/eckaeg.h index 31b65740c..7c4dfdb2d 100644 --- a/src/pubkey/eckaeg/eckaeg.h +++ b/src/pubkey/eckaeg/eckaeg.h @@ -68,9 +68,10 @@ class BOTAN_DLL ECKAEG_PublicKey : public virtual EC_PublicKey protected: void X509_load_hook(); - virtual void set_all_values(const ECKAEG_PublicKey& other); ECKAEG_Core m_eckaeg_core; + private: + void set_all_values(const ECKAEG_PublicKey& other); }; /** @@ -128,8 +129,8 @@ class BOTAN_DLL ECKAEG_PrivateKey : public ECKAEG_PublicKey, */ virtual void affirm_init() const; - protected: - virtual void set_all_values(const ECKAEG_PrivateKey& other); + private: + void set_all_values(const ECKAEG_PrivateKey& other); }; } -- cgit v1.2.3