diff options
| author | laurent-richard <[email protected]> | 2014-02-05 13:23:04 +0000 |
|---|---|---|
| committer | laurent-richard <[email protected]> | 2014-02-05 13:23:04 +0000 |
| commit | 37869c06ce9458a83a649d5bfe3c46a9b546d9c7 (patch) | |
| tree | 232d38eb1a2a6d4293d00228d4d952557a365e4c | |
| parent | Merge branch 'master' of https://github.com/kisli/vmime (diff) | |
| download | vmime-37869c06ce9458a83a649d5bfe3c46a9b546d9c7.tar.gz vmime-37869c06ce9458a83a649d5bfe3c46a9b546d9c7.zip | |
Fixed null value in Windows build.
| -rw-r--r-- | src/vmime/platforms/windows/windowsFile.cpp | 2 | ||||
| -rw-r--r-- | src/vmime/platforms/windows/windowsHandler.cpp | 2 | ||||
| -rw-r--r-- | src/vmime/platforms/windows/windowsSocket.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vmime/platforms/windows/windowsFile.cpp b/src/vmime/platforms/windows/windowsFile.cpp index 6aa0fea8..0ab90b16 100644 --- a/src/vmime/platforms/windows/windowsFile.cpp +++ b/src/vmime/platforms/windows/windowsFile.cpp @@ -310,7 +310,7 @@ bool windowsFile::exists() const shared_ptr <vmime::utility::file> windowsFile::getParent() const { if (m_path.isEmpty()) - return NULL; + return null; else return make_shared <windowsFile>(m_path.getParent()); } diff --git a/src/vmime/platforms/windows/windowsHandler.cpp b/src/vmime/platforms/windows/windowsHandler.cpp index 9c96b271..79c46876 100644 --- a/src/vmime/platforms/windows/windowsHandler.cpp +++ b/src/vmime/platforms/windows/windowsHandler.cpp @@ -293,7 +293,7 @@ shared_ptr <vmime::utility::fileSystemFactory> windowsHandler::getFileSystemFact shared_ptr <vmime::utility::childProcessFactory> windowsHandler::getChildProcessFactory() { // TODO: Not implemented - return (NULL); + return null; } #endif diff --git a/src/vmime/platforms/windows/windowsSocket.cpp b/src/vmime/platforms/windows/windowsSocket.cpp index bd20e5d4..f6541558 100644 --- a/src/vmime/platforms/windows/windowsSocket.cpp +++ b/src/vmime/platforms/windows/windowsSocket.cpp @@ -473,7 +473,7 @@ shared_ptr <net::timeoutHandler> windowsSocket::getTimeoutHandler() shared_ptr <vmime::net::socket> windowsSocketFactory::create() { - shared_ptr <vmime::net::timeoutHandler> th = NULL; + shared_ptr <vmime::net::timeoutHandler> th; return make_shared <windowsSocket>(th); } |