propagate from branch 'net.randombit.botan' (head 14c1d4dc8696d2705a70ec3d2403e01d2ca95265)

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/s2k/s2k.h b/src/s2k/s2k.h
index 7af92519b..ca86ab77a 100644
--- a/src/s2k/s2k.h
+++ b/src/s2k/s2k.h
@@ -87,12 +87,13 @@ class BOTAN_DLL S2K
 
       S2K() { iter = 0; }
       virtual ~S2K() {}
-   private:
-      S2K(const S2K&) {}
-      S2K& operator=(const S2K&) { return (*this); }
 
+      S2K(const S2K&) = delete;
+      S2K& operator=(const S2K&) = delete;
+   private:
       virtual OctetString derive(u32bit, const std::string&,
                                  const byte[], u32bit, u32bit) const = 0;
+
       SecureVector<byte> salt;
       u32bit iter;
    };