From e3d993e4272f1e01fcd0c7b3978225e6478602fc Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Wed, 25 Jul 2012 00:03:35 -0400 Subject: [PATCH] lib: switch new Data class constants to #defines to preserve ABI compatibility --- src/data.cc | 6 +++--- src/data.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/data.cc b/src/data.cc index 0786e0d3..2fb420de 100644 --- a/src/data.cc +++ b/src/data.cc @@ -66,9 +66,9 @@ inline bool IsHexData(const std::string &s) bool Data::bPrintAscii = true; Data::Data() - : m_memBlock(new unsigned char[DEFAULT_SIZE + DEFAULT_PREPEND_SIZE]) - , m_blockSize(DEFAULT_SIZE + DEFAULT_PREPEND_SIZE) - , m_dataStart(m_memBlock + DEFAULT_PREPEND_SIZE) + : m_memBlock(new unsigned char[BARRY_DATA_DEFAULT_SIZE + BARRY_DATA_DEFAULT_PREPEND_SIZE]) + , m_blockSize(BARRY_DATA_DEFAULT_SIZE + BARRY_DATA_DEFAULT_PREPEND_SIZE) + , m_dataStart(m_memBlock + BARRY_DATA_DEFAULT_PREPEND_SIZE) , m_dataSize(0) , m_externalData(0) , m_external(false) diff --git a/src/data.h b/src/data.h index e7e70f72..12597352 100644 --- a/src/data.h +++ b/src/data.h @@ -28,6 +28,9 @@ #include #include +#define BARRY_DATA_DEFAULT_SIZE 0x4000 +#define BARRY_DATA_DEFAULT_PREPEND_SIZE 0x100 + namespace Barry { class BXEXPORT Data @@ -59,11 +62,8 @@ protected: size_t AvailablePrependSpace() const; public: - static const int DEFAULT_SIZE = 0x4000; - static const int DEFAULT_PREPEND_SIZE = 0x100; - Data(); - explicit Data(int endpoint, size_t startsize = DEFAULT_SIZE, size_t prependsize = DEFAULT_PREPEND_SIZE); + explicit Data(int endpoint, size_t startsize = BARRY_DATA_DEFAULT_SIZE, size_t prependsize = BARRY_DATA_DEFAULT_PREPEND_SIZE); Data(const void *ValidData, size_t size); Data(const Data &other); ~Data(); -- 2.11.4.GIT