diff options
author | lloyd <[email protected]> | 2010-10-13 15:04:52 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-10-13 15:04:52 +0000 |
commit | fc4c8f57baa06cfc9073ce83a5e3d1547bea86c0 (patch) | |
tree | 569e6b94f20fd71085c7eaeafe92b051697da613 /src/pbkdf/pbkdf.h | |
parent | 30a71cfa8d2d4c78e3a2b9f4c394b652f457e1f2 (diff) | |
parent | 6e85766cf001183e160c8ca2c0ed3eb40f07125c (diff) |
propagate from branch 'net.randombit.botan' (head 0b2a6834cd19e431afc91bd062b0b455d6d035ac)
to branch 'net.randombit.botan.c++0x' (head fbb6dc287edf127cc84fc29f9d8477769d5cfd7f)
Diffstat (limited to 'src/pbkdf/pbkdf.h')
-rw-r--r-- | src/pbkdf/pbkdf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pbkdf/pbkdf.h b/src/pbkdf/pbkdf.h index 91883f9e2..03e6c51cf 100644 --- a/src/pbkdf/pbkdf.h +++ b/src/pbkdf/pbkdf.h @@ -52,9 +52,9 @@ class BOTAN_DLL PBKDF PBKDF() {} virtual ~PBKDF() {} - private: - PBKDF(const PBKDF&) {} - PBKDF& operator=(const PBKDF&) { return (*this); } + + PBKDF(const PBKDF&) = delete; + PBKDF& operator=(const PBKDF&) = delete; }; /** |