propagate from branch 'net.randombit.botan' (head 2898d79f992f27a328a3e41d34b46eb1052da0de)

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

2 files changed, 4 insertions, 4 deletions

diff --git a/src/pbkdf/pbkdf.h b/src/pbkdf/pbkdf.h
index 91883f9e2..03e6c51cf 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;
    };
 
 /**
diff --git a/src/pbkdf/pbkdf2/pbkdf2.cpp b/src/pbkdf/pbkdf2/pbkdf2.cpp
index 7e4d1cd8a..39d53d417 100644
--- a/src/pbkdf/pbkdf2/pbkdf2.cpp
+++ b/src/pbkdf/pbkdf2/pbkdf2.cpp
@@ -30,7 +30,7 @@ OctetString PKCS5_PBKDF2::derive_key(size_t key_len,
    catch(Invalid_Key_Length)
       {
       throw Exception(name() + " cannot accept passphrases of length " +
-                      to_string(passphrase.length()));
+                      std::to_string(passphrase.length()));
       }
 
    SecureVector<byte> key(key_len);