From 1c753203b5c8c643f95878f157d57db867bf9ce1 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 6 Dec 2009 15:13:19 +1300 Subject: [PATCH] Author: Francesco Chemolli Fix more gcc-ism in CBDATA_DEBUG --- src/cbdata.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cbdata.h b/src/cbdata.h index ec5506004b..9d3c179209 100644 --- a/src/cbdata.h +++ b/src/cbdata.h @@ -73,6 +73,7 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in #define cbdataInternalUnlock(a) cbdataInternalUnlockDbg(a,__FILE__,__LINE__) #define cbdataReferenceValidDone(var, ptr) cbdataInternalReferenceDoneValidDbg((void **)&(var), (ptr), __FILE__,__LINE__) #define CBDATA_CLASS2(type) \ + private: \ static cbdata_type CBDATA_##type; \ public: \ void *operator new(size_t size) { \ @@ -83,8 +84,8 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in void operator delete (void *address) { \ if (address) cbdataInternalFreeDbg(address,__FILE__,__LINE__); \ } \ - private: #else +#else /* CBDATA_DEBUG */ #define cbdataAlloc(type) ((type *)cbdataInternalAlloc(CBDATA_##type)) #define cbdataFree(var) do {if (var) {cbdataInternalFree(var); var = NULL;}} while(0) #define cbdataReferenceValidDone(var, ptr) cbdataInternalReferenceDoneValid((void **)&(var), (ptr)) -- 2.47.2