Add C++ nullptr support (Issue 383)

1 files changed, 8 insertions, 8 deletions

diff --git a/default.h b/default.h
index 9dd20d08..78bc0d19 100644
--- a/default.h
+++ b/default.h
@@ -92,13 +92,13 @@ public:
 	//! \brief Construct a DataEncryptor

 	//! \param passphrase a C-String password

 	//! \param attachment a BufferedTransformation to attach to this object

-	DataEncryptor(const char *passphrase, BufferedTransformation *attachment = NULL);

+	DataEncryptor(const char *passphrase, BufferedTransformation *attachment = NULLPTR);

 

 	//! \brief Construct a DataEncryptor

 	//! \param passphrase a byte string password

 	//! \param passphraseLength the length of the byte string password

 	//! \param attachment a BufferedTransformation to attach to this object

-	DataEncryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL);

+	DataEncryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULLPTR);

 

 protected:

 	void FirstPut(const byte *);

@@ -132,14 +132,14 @@ public:
 	//! \param passphrase a C-String password

 	//! \param attachment a BufferedTransformation to attach to this object

 	//! \param throwException a flag specifiying whether an Exception should be thrown on error

-	DataDecryptor(const char *passphrase, BufferedTransformation *attachment = NULL, bool throwException=true);

+	DataDecryptor(const char *passphrase, BufferedTransformation *attachment = NULLPTR, bool throwException=true);

 

 	//! \brief Constructs a DataDecryptor

 	//! \param passphrase a byte string password

 	//! \param passphraseLength the length of the byte string password

 	//! \param attachment a BufferedTransformation to attach to this object

 	//! \param throwException a flag specifiying whether an Exception should be thrown on error

-	DataDecryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL, bool throwException=true);

+	DataDecryptor(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULLPTR, bool throwException=true);

 

 	enum State {WAITING_FOR_KEYCHECK, KEY_GOOD, KEY_BAD};

 	State CurrentState() const {return m_state;}

@@ -183,13 +183,13 @@ public:
 	//! \brief Constructs a DataEncryptorWithMAC

 	//! \param passphrase a C-String password

 	//! \param attachment a BufferedTransformation to attach to this object

-	DataEncryptorWithMAC(const char *passphrase, BufferedTransformation *attachment = NULL);

+	DataEncryptorWithMAC(const char *passphrase, BufferedTransformation *attachment = NULLPTR);

 

 	//! \brief Constructs a DataEncryptorWithMAC

 	//! \param passphrase a byte string password

 	//! \param passphraseLength the length of the byte string password

 	//! \param attachment a BufferedTransformation to attach to this object

-	DataEncryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL);

+	DataEncryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULLPTR);

 

 protected:

 	void FirstPut(const byte *inString) {CRYPTOPP_UNUSED(inString);}

@@ -224,14 +224,14 @@ public:
 	//! \param passphrase a C-String password

 	//! \param attachment a BufferedTransformation to attach to this object

 	//! \param throwException a flag specifiying whether an Exception should be thrown on error

-	DataDecryptorWithMAC(const char *passphrase, BufferedTransformation *attachment = NULL, bool throwException=true);

+	DataDecryptorWithMAC(const char *passphrase, BufferedTransformation *attachment = NULLPTR, bool throwException=true);

 

 	//! \brief Constructs a DataDecryptor

 	//! \param passphrase a byte string password

 	//! \param passphraseLength the length of the byte string password

 	//! \param attachment a BufferedTransformation to attach to this object

 	//! \param throwException a flag specifiying whether an Exception should be thrown on error

-	DataDecryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULL, bool throwException=true);

+	DataDecryptorWithMAC(const byte *passphrase, size_t passphraseLength, BufferedTransformation *attachment = NULLPTR, bool throwException=true);

 

 	typename DataDecryptor<BC,H,Info>::State CurrentState() const;

 	bool CheckLastMAC() const;