mutable instead of const_cast for nicer code
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5636 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
709ed79b5b
commit
09df47d0f2
2 changed files with 8 additions and 10 deletions
|
@ -263,12 +263,10 @@ void *MMapFile::get(int offset, int *sizep) const
|
|||
size += offset - alignedoffset;
|
||||
|
||||
#ifdef _WIN32
|
||||
const_cast<MMapFile*>(this)->m_pView =
|
||||
MapViewOfFile(m_hFileMap, m_bReadOnly ? FILE_MAP_READ : FILE_MAP_WRITE, 0, alignedoffset, size);
|
||||
m_pView = MapViewOfFile(m_hFileMap, m_bReadOnly ? FILE_MAP_READ : FILE_MAP_WRITE, 0, alignedoffset, size);
|
||||
#else
|
||||
const_cast<MMapFile*>(this)->m_pView =
|
||||
mmap(0, size, m_bReadOnly ? PROT_READ : PROT_READ | PROT_WRITE, MAP_SHARED, m_hFileDesc, alignedoffset);
|
||||
const_cast<MMapFile*>(this)->m_iMappedSize = *sizep = size;
|
||||
m_pView = mmap(0, size, m_bReadOnly ? PROT_READ : PROT_READ | PROT_WRITE, MAP_SHARED, m_hFileDesc, alignedoffset);
|
||||
m_iMappedSize = *sizep = size;
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
|
@ -297,11 +295,11 @@ void *MMapFile::getmore(int offset, int size) const
|
|||
#ifndef _WIN32
|
||||
int iMappedSizeBackup = m_iMappedSize;
|
||||
#endif
|
||||
const_cast<MMapFile*>(this)->m_pView = 0;
|
||||
m_pView = 0;
|
||||
pView = get(offset, size);
|
||||
const_cast<MMapFile*>(this)->m_pView = pViewBackup;
|
||||
m_pView = pViewBackup;
|
||||
#ifndef _WIN32
|
||||
const_cast<MMapFile*>(this)->m_iMappedSize = iMappedSizeBackup;
|
||||
m_iMappedSize = iMappedSizeBackup;
|
||||
#endif
|
||||
return pView;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue