aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbkdf
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-09-03 13:55:19 +0000
committerlloyd <[email protected]>2010-09-03 13:55:19 +0000
commit7e54763ea43c8b34729387c7429922dd981c4f5b (patch)
tree33a1bd0f32e4ab7958a484e468316291c527dd24 /src/pbkdf
parentfb68795162b8d107cbd284c4a75d8e13ce589829 (diff)
parentec8c59af3db02ff159908f9a446e53c4ea20d474 (diff)
propagate from branch 'net.randombit.botan' (head a29c41b4a949207b1544096c3afab668f8b5179e)
to branch 'net.randombit.botan.c++0x' (head a9d0c2f805b3c20a4c648575d7256959db8329fe)
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 675330843..14615103f 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;
};
/**