gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16983) -Change: work around a bogus GCC 4.4+ warning that can't be disabled

Browse Source
This commit is contained in:
rubidium 2009-07-29 20:24:48 +00:00
parent 0930c3c098
commit 3a6c0a9f22
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/misc/blob.hpp
View File

@ -58,6 +58,10 @@ protected:
CHdr *m_pHdr_1; ///< ptr just after the CHdr holding m_size and m_max_size
} ptr_u;
private:
/** Just to silence an unsilencable GCC 4.4+ warning */
static const CHdr hdrEmpty[];
public:
static const bsize_t Ttail_reserve = 4; ///< four extra bytes will be always allocated and zeroed at the end
@ -96,8 +100,7 @@ protected:
* both m_size and m_max_size containing zero */
FORCEINLINE void InitEmpty()
{
static CHdr hdrEmpty[] = {{0, 0}, {0, 0}};
ptr_u.m_pHdr_1 = &hdrEmpty[1];
ptr_u.m_pHdr_1 = const_cast<CHdr *>(&CBlobBaseSimple::hdrEmpty[1]);
}
/** initialize blob by attaching it to the given header followed by data */
@ -297,6 +300,9 @@ public:
/** all deallocations should happen here */
static FORCEINLINE void RawFree(CHdr *p)
{
/* Just to silence an unsilencable GCC 4.4+ warning */
assert(p != CBlobBaseSimple::hdrEmpty);
free(p);
}
/** fixing the four bytes at the end of blob data - useful when blob is used to hold string */

2
src/misc/dbg_helpers.cpp
View File

@ -167,3 +167,5 @@ void DumpTarget::EndStruct()
m_cur_struct.pop();
}
/** Just to silence an unsilencable GCC 4.4+ warning */
/* static */ const CBlobBaseSimple::CHdr CBlobBaseSimple::hdrEmpty[] = {{0, 0}, {0, 0}};