aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbkdf
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-07-09 20:28:29 +0000
committerlloyd <[email protected]>2010-07-09 20:28:29 +0000
commit91137b44613c7ed5a12a1c64a6fd3e119828c43c (patch)
tree60d3728bc11356dc60b37859ac34f1d61138e82d /src/pbkdf
parenta2775c5bd9f6979da3e1981cdb1dec250e274fea (diff)
parent54bac11c5d4e051f996951feb6a037b1de001329 (diff)
propagate from branch 'net.randombit.botan' (head 161b5c0300b72baa746f101fda1e2b4a7c71818c)
to branch 'net.randombit.botan.c++0x' (head 1fc3875bb8daf4ad0e90ba66db72642203cb9984)
Diffstat (limited to 'src/pbkdf')
-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;
};
/**