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).
This commit is contained in:
parent
63d6a2ac5a
commit
5341f2d1f7
@ -464,7 +464,7 @@ void windowsFileReaderInputStream::reset()
|
|||||||
SetFilePointer(m_hFile, 0, NULL, FILE_BEGIN);
|
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;
|
DWORD dwBytesRead;
|
||||||
if (!ReadFile(m_hFile, (LPVOID)data, (DWORD)count, &dwBytesRead, NULL))
|
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;
|
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 dwCurPos = SetFilePointer(m_hFile, 0, NULL, FILE_CURRENT);
|
||||||
DWORD dwNewPos = SetFilePointer(m_hFile, (LONG)count, NULL, FILE_CURRENT);
|
DWORD dwNewPos = SetFilePointer(m_hFile, (LONG)count, NULL, FILE_CURRENT);
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <cctype>
|
||||||
#include <locale>
|
#include <locale>
|
||||||
|
|
||||||
#include "vmime/config.hpp"
|
#include "vmime/config.hpp"
|
||||||
|
@ -73,7 +73,7 @@ public:
|
|||||||
bool canRead() const;
|
bool canRead() const;
|
||||||
bool canWrite() const;
|
bool canWrite() const;
|
||||||
|
|
||||||
const length_type getLength();
|
length_type getLength();
|
||||||
|
|
||||||
const path& getFullPath() const;
|
const path& getFullPath() const;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user