From 49b20f4e4ff3b8e3141905871ccae9fc70e77a1d Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 17 Nov 2009 16:25:51 +0000 Subject: Use the new support for explicitly deleting functions instead of hiding them as private variables for operator= and copy constructors that shouldn't be used. --- src/cert/x509/x509_ca.h | 6 +++--- src/cert/x509/x509stor.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cert/x509') diff --git a/src/cert/x509/x509_ca.h b/src/cert/x509/x509_ca.h index 6eb4bbbef..b680bd0e4 100644 --- a/src/cert/x509/x509_ca.h +++ b/src/cert/x509/x509_ca.h @@ -97,11 +97,11 @@ class BOTAN_DLL X509_CA const Private_Key& key, const std::string& hash_fn); + X509_CA(const X509_CA&) = delete; + X509_CA& operator=(const X509_CA&) = delete; + ~X509_CA(); private: - X509_CA(const X509_CA&) {} - X509_CA& operator=(const X509_CA&) { return (*this); } - X509_CRL make_crl(const std::vector& entries, u32bit crl_number, u32bit next_update, RandomNumberGenerator& rng) const; diff --git a/src/cert/x509/x509stor.h b/src/cert/x509/x509stor.h index ab31663ed..958b6da0f 100644 --- a/src/cert/x509/x509stor.h +++ b/src/cert/x509/x509stor.h @@ -94,14 +94,14 @@ class BOTAN_DLL X509_Store static X509_Code check_sig(const X509_Object&, Public_Key*); + X509_Store& operator=(const X509_Store&) = delete; + X509_Store(u32bit time_slack = 24*60*60, u32bit cache_results = 30*60); X509_Store(const X509_Store&); ~X509_Store(); private: - X509_Store& operator=(const X509_Store&) { return (*this); } - class BOTAN_DLL Cert_Info { public: -- cgit v1.2.3