Index: core/src/fxcrt/extension.h |
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h |
index bb2a79b9f92ccae4e8ddc93119080750c9b9f238..c23a2e3369f2456f72243b9ae37937e46242c9f6 100644 |
--- a/core/src/fxcrt/extension.h |
+++ b/core/src/fxcrt/extension.h |
@@ -36,27 +36,27 @@ public: |
m_pFile->Release(); |
} |
} |
- virtual IFX_FileStream* Retain() |
+ virtual IFX_FileStream* Retain() FX_OVERRIDE |
{ |
m_dwCount ++; |
return this; |
} |
- virtual void Release() |
+ virtual void Release() FX_OVERRIDE |
{ |
FX_DWORD nCount = -- m_dwCount; |
if (!nCount) { |
delete this; |
} |
} |
- virtual FX_FILESIZE GetSize() |
+ virtual FX_FILESIZE GetSize() FX_OVERRIDE |
{ |
return m_bUseRange ? m_nSize : m_pFile->GetSize(); |
} |
- virtual FX_BOOL IsEOF() |
+ virtual FX_BOOL IsEOF() FX_OVERRIDE |
{ |
return GetPosition() >= GetSize(); |
} |
- virtual FX_FILESIZE GetPosition() |
+ virtual FX_FILESIZE GetPosition() FX_OVERRIDE |
{ |
FX_FILESIZE pos = m_pFile->GetPosition(); |
if (m_bUseRange) { |
@@ -64,7 +64,7 @@ public: |
} |
return pos; |
} |
- virtual FX_BOOL SetRange(FX_FILESIZE offset, FX_FILESIZE size) |
+ virtual FX_BOOL SetRange(FX_FILESIZE offset, FX_FILESIZE size) FX_OVERRIDE |
{ |
if (offset < 0 || size < 0) { |
return FALSE; |
@@ -82,11 +82,11 @@ public: |
m_pFile->SetPosition(m_nOffset); |
return TRUE; |
} |
- virtual void ClearRange() |
+ virtual void ClearRange() FX_OVERRIDE |
{ |
m_bUseRange = FALSE; |
} |
- virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) |
+ virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE |
{ |
if (m_bUseRange && offset < 0) { |
return FALSE; |
@@ -101,7 +101,7 @@ public: |
} |
return (FX_BOOL)m_pFile->ReadPos(buffer, size, pos.ValueOrDie()); |
} |
- virtual size_t ReadBlock(void* buffer, size_t size) |
+ virtual size_t ReadBlock(void* buffer, size_t size) FX_OVERRIDE |
{ |
if (m_bUseRange) { |
FX_FILESIZE availSize = m_nOffset + m_nSize - m_pFile->GetPosition(); |
@@ -111,14 +111,14 @@ public: |
} |
return m_pFile->Read(buffer, size); |
} |
- virtual FX_BOOL WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size) |
+ virtual FX_BOOL WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE |
{ |
if (m_bUseRange) { |
offset += m_nOffset; |
} |
return (FX_BOOL)m_pFile->WritePos(buffer, size, offset); |
} |
- virtual FX_BOOL Flush() |
+ virtual FX_BOOL Flush() FX_OVERRIDE |
{ |
return m_pFile->Flush(); |
} |
@@ -164,12 +164,12 @@ public: |
} |
m_Blocks.RemoveAll(); |
} |
- virtual IFX_FileStream* Retain() |
+ virtual IFX_FileStream* Retain() FX_OVERRIDE |
{ |
m_dwCount ++; |
return this; |
} |
- virtual void Release() |
+ virtual void Release() FX_OVERRIDE |
{ |
FX_DWORD nCount = -- m_dwCount; |
if (nCount) { |
@@ -177,15 +177,15 @@ public: |
} |
delete this; |
} |
- virtual FX_FILESIZE GetSize() |
+ virtual FX_FILESIZE GetSize() FX_OVERRIDE |
{ |
return m_bUseRange ? (FX_FILESIZE) m_nSize : (FX_FILESIZE)m_nCurSize; |
} |
- virtual FX_BOOL IsEOF() |
+ virtual FX_BOOL IsEOF() FX_OVERRIDE |
{ |
return m_nCurPos >= (size_t)GetSize(); |
} |
- virtual FX_FILESIZE GetPosition() |
+ virtual FX_FILESIZE GetPosition() FX_OVERRIDE |
{ |
FX_FILESIZE pos = (FX_FILESIZE)m_nCurPos; |
if (m_bUseRange) { |
@@ -193,7 +193,7 @@ public: |
} |
return pos; |
} |
- virtual FX_BOOL SetRange(FX_FILESIZE offset, FX_FILESIZE size) |
+ virtual FX_BOOL SetRange(FX_FILESIZE offset, FX_FILESIZE size) FX_OVERRIDE |
{ |
if (offset < 0 || size < 0) { |
return FALSE; |
@@ -209,11 +209,11 @@ public: |
m_nCurPos = m_nOffset; |
return TRUE; |
} |
- virtual void ClearRange() |
+ virtual void ClearRange() FX_OVERRIDE |
{ |
m_bUseRange = FALSE; |
} |
- virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) |
+ virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE |
{ |
if (!buffer || !size) { |
return FALSE; |
@@ -256,7 +256,7 @@ public: |
} |
return TRUE; |
} |
- virtual size_t ReadBlock(void* buffer, size_t size) |
+ virtual size_t ReadBlock(void* buffer, size_t size) FX_OVERRIDE |
{ |
if (m_nCurPos >= m_nCurSize) { |
return 0; |
@@ -273,7 +273,7 @@ public: |
} |
return nRead; |
} |
- virtual FX_BOOL WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size) |
+ virtual FX_BOOL WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE |
{ |
if (!buffer || !size) { |
return FALSE; |
@@ -333,15 +333,15 @@ public: |
} |
return TRUE; |
} |
- virtual FX_BOOL Flush() |
+ virtual FX_BOOL Flush() FX_OVERRIDE |
{ |
return TRUE; |
} |
- virtual FX_BOOL IsConsecutive() const |
+ virtual FX_BOOL IsConsecutive() const FX_OVERRIDE |
{ |
return m_dwFlags & FX_MEMSTREAM_Consecutive; |
} |
- virtual void EstimateSize(size_t nInitSize, size_t nGrowSize) |
+ virtual void EstimateSize(size_t nInitSize, size_t nGrowSize) FX_OVERRIDE |
{ |
if (m_dwFlags & FX_MEMSTREAM_Consecutive) { |
if (m_Blocks.GetSize() < 1) { |
@@ -355,11 +355,11 @@ public: |
m_nGrowSize = FX_MAX(nGrowSize, 4096); |
} |
} |
- virtual FX_LPBYTE GetBuffer() const |
+ virtual FX_LPBYTE GetBuffer() const FX_OVERRIDE |
{ |
return m_Blocks.GetSize() ? (FX_LPBYTE)m_Blocks[0] : NULL; |
} |
- virtual void AttachBuffer(FX_LPBYTE pBuffer, size_t nSize, FX_BOOL bTakeOver = FALSE) |
+ virtual void AttachBuffer(FX_LPBYTE pBuffer, size_t nSize, FX_BOOL bTakeOver = FALSE) FX_OVERRIDE |
{ |
if (!(m_dwFlags & FX_MEMSTREAM_Consecutive)) { |
return; |
@@ -371,7 +371,7 @@ public: |
m_dwFlags = FX_MEMSTREAM_Consecutive | (bTakeOver ? FX_MEMSTREAM_TakeOver : 0); |
ClearRange(); |
} |
- virtual void DetachBuffer() |
+ virtual void DetachBuffer() FX_OVERRIDE |
{ |
if (!(m_dwFlags & FX_MEMSTREAM_Consecutive)) { |
return; |