diff options
| author | Vincent Richard <[email protected]> | 2009-11-04 12:52:49 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2009-11-04 12:52:49 +0000 |
| commit | 5341f2d1f7405dd491b3fb194e33cdd7927a983e (patch) | |
| tree | 18f2acb73c46bb4ad39a32e5dd3edbb81a4e1c62 | |
| parent | Reset EOF flag when stream is reset. (diff) | |
| download | vmime-5341f2d1f7405dd491b3fb194e33cdd7927a983e.tar.gz vmime-5341f2d1f7405dd491b3fb194e33cdd7927a983e.zip | |
Removed some unnecessary consts on integral types where overrides conflict. Added <cctype> to get the std::isspace that doesn't require a 2nd arg 'locale' (thanks to Ben Jackson).
| -rw-r--r-- | src/platforms/windows/windowsFile.cpp | 4 | ||||
| -rw-r--r-- | vmime/base.hpp | 1 | ||||
| -rw-r--r-- | vmime/platforms/windows/windowsFile.hpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/platforms/windows/windowsFile.cpp b/src/platforms/windows/windowsFile.cpp index 5412a3b9..82c5696f 100644 --- a/src/platforms/windows/windowsFile.cpp +++ b/src/platforms/windows/windowsFile.cpp @@ -464,7 +464,7 @@ void windowsFileReaderInputStream::reset() SetFilePointer(m_hFile, 0, NULL, FILE_BEGIN); } -const vmime::utility::stream::size_type windowsFileReaderInputStream::read(value_type* const data, const size_type count) +vmime::utility::stream::size_type windowsFileReaderInputStream::read(value_type* const data, const size_type count) { DWORD dwBytesRead; if (!ReadFile(m_hFile, (LPVOID)data, (DWORD)count, &dwBytesRead, NULL)) @@ -472,7 +472,7 @@ const vmime::utility::stream::size_type windowsFileReaderInputStream::read(value return dwBytesRead; } -const vmime::utility::stream::size_type windowsFileReaderInputStream::skip(const size_type count) +vmime::utility::stream::size_type windowsFileReaderInputStream::skip(const size_type count) { DWORD dwCurPos = SetFilePointer(m_hFile, 0, NULL, FILE_CURRENT); DWORD dwNewPos = SetFilePointer(m_hFile, (LONG)count, NULL, FILE_CURRENT); diff --git a/vmime/base.hpp b/vmime/base.hpp index ad00d3f3..ce544e19 100644 --- a/vmime/base.hpp +++ b/vmime/base.hpp @@ -29,6 +29,7 @@ #include <vector> #include <map> #include <sstream> +#include <cctype> #include <locale> #include "vmime/config.hpp" diff --git a/vmime/platforms/windows/windowsFile.hpp b/vmime/platforms/windows/windowsFile.hpp index a2a9e920..6e1c8fbb 100644 --- a/vmime/platforms/windows/windowsFile.hpp +++ b/vmime/platforms/windows/windowsFile.hpp @@ -73,7 +73,7 @@ public: bool canRead() const; bool canWrite() const; - const length_type getLength(); + length_type getLength(); const path& getFullPath() const; |