propagate from branch 'net.randombit.botan' (head 9932d4d63417f7fcc199ada244cbaa6c1c32d9c1)

            to branch 'net.randombit.botan.c++0x' (head f4a385a376311edc62ef506c72cc56f69e6efd5a)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/s2k/s2k.h b/src/s2k/s2k.h
index 055ef8911..db59a5fe8 100644
--- a/src/s2k/s2k.h
+++ b/src/s2k/s2k.h
@@ -51,9 +51,9 @@ class BOTAN_DLL S2K
 
       S2K() {}
       virtual ~S2K() {}
-   private:
-      S2K(const S2K&) {}
-      S2K& operator=(const S2K&) { return (*this); }
+
+      S2K(const S2K&) = delete;
+      S2K& operator=(const S2K&) = delete;
    };
 
 }