Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed BLOCK_SIZE which conflicts with a #define in a std Linux (and maybe not only) header (bug 1339731)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-29 17:46:12 +00:00
parent a30ccc2d42
commit ae0ca7559c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/buffer.h
View File

@@ -124,13 +124,13 @@ class wxMemoryBufferData
{ {
public: public:
// the initial size and also the size added by ResizeIfNeeded() // the initial size and also the size added by ResizeIfNeeded()
enum { BLOCK_SIZE = 1024 }; enum { DefBufSize = 1024 };
friend class wxMemoryBuffer; friend class wxMemoryBuffer;
// everyting is private as it can only be used by wxMemoryBuffer // everyting is private as it can only be used by wxMemoryBuffer
private: private:
wxMemoryBufferData(size_t size = wxMemoryBufferData::BLOCK_SIZE) wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize)
: m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0) : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0)
{ {
} }
@@ -142,13 +142,13 @@ private:
if (newSize > m_size) if (newSize > m_size)
{ {
void *dataOld = m_data; void *dataOld = m_data;
m_data = realloc(m_data, newSize + wxMemoryBufferData::BLOCK_SIZE); m_data = realloc(m_data, newSize + wxMemoryBufferData::DefBufSize);
if ( !m_data ) if ( !m_data )
{ {
free(dataOld); free(dataOld);
} }
m_size = newSize + wxMemoryBufferData::BLOCK_SIZE; m_size = newSize + wxMemoryBufferData::DefBufSize;
} }
} }
@@ -181,7 +181,7 @@ class wxMemoryBuffer
{ {
public: public:
// ctor and dtor // ctor and dtor
wxMemoryBuffer(size_t size = wxMemoryBufferData::BLOCK_SIZE) wxMemoryBuffer(size_t size = wxMemoryBufferData::DefBufSize)
{ {
m_bufdata = new wxMemoryBufferData(size); m_bufdata = new wxMemoryBufferData(size);
m_bufdata->IncRef(); m_bufdata->IncRef();