aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbkdf/pbkdf.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-08-13 15:13:21 +0000
committerlloyd <[email protected]>2010-08-13 15:13:21 +0000
commit3da3b04e1ba1577b3d0e1b4b9b3f4b24381fc433 (patch)
tree8a4b3a3b8e830ffcbd41f41859db4ab4fd972fb2 /src/pbkdf/pbkdf.h
parent2cae6ec17984ad016f973d5925860278e575b3f4 (diff)
parent789cee0888bbede838a2a3cf6221677c9f172872 (diff)
propagate from branch 'net.randombit.botan' (head 0a3348f52bf558bc2282e1066c2913a72a1aeda5)
to branch 'net.randombit.botan.c++0x' (head 552c20ae8874f12da779fc25ea368e36e71cbfe8)
Diffstat (limited to 'src/pbkdf/pbkdf.h')
-rw-r--r--src/pbkdf/pbkdf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pbkdf/pbkdf.h b/src/pbkdf/pbkdf.h
index eaad1fca9..7262a4d9f 100644
--- a/src/pbkdf/pbkdf.h
+++ b/src/pbkdf/pbkdf.h
@@ -53,9 +53,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;
};
/**