From 8ba032c4241784084c77cee949b43b83c84ab399 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Wed, 12 Apr 2017 21:44:51 -0700 Subject: [PATCH] Change uses of _DEBUG and _DEBUG_DB defines to be DEBUG, since that's the only symbol that gets defined by configuring with --enable-debug. --- src/core/archive.cpp | 2 +- src/core/cmdlineparser.cpp | 2 +- src/core/cmdlineparser.h | 2 +- src/core/codeconvert.cpp | 4 ++-- src/core/debug.cpp | 2 +- src/core/debug.h | 4 ++-- src/core/errortable.cpp | 4 ++-- src/core/errortable.h | 4 ++-- src/core/file_unix.cpp | 2 +- src/core/fileheader.cpp | 4 ++-- src/core/hashtable.h | 6 +++--- src/core/ntmbs.cpp | 2 +- src/core/package.h | 6 +++--- src/core/refcountobj.cpp | 12 ++++++------ src/core/refcountobj.h | 2 +- src/core/resources.h | 2 +- src/core/serializerimpl.cpp | 2 +- src/core/srefcounttbl.cpp | 2 +- src/core/stdcore.h | 2 +- src/db/blockfile.cpp | 2 +- src/db/blockfile.h | 2 +- src/fco/fconame.cpp | 28 ++++++++++++++-------------- src/fco/fconame.h | 2 +- src/fco/fconametbl.cpp | 2 +- src/fco/fcosetws.h | 4 ++-- src/fco/fcospecimpl.cpp | 10 +++++----- src/fco/signature.cpp | 4 ++-- src/fs/fsobject.cpp | 8 ++++---- src/fs/fsobject.h | 2 +- src/fs/fspropcalc.cpp | 2 +- src/parser/tokens.l | 4 ++-- src/tripwire/integritycheck.cpp | 2 +- src/tripwire/tripwiremain.cpp | 4 ++-- src/tripwire/twcmdline.cpp | 12 ++++++------ src/tripwire/twcmdline.h | 6 +++--- src/tw/configfile.cpp | 4 ++-- src/tw/dbdatasource.cpp | 4 ++-- src/tw/fcodatabasefile.cpp | 2 +- src/tw/fcoreport.cpp | 2 +- src/tw/textreportviewer.cpp | 2 +- src/tw/twinit.cpp | 2 +- src/tw/twstrings.cpp | 2 +- src/tw/twutil.cpp | 2 +- src/twadmin/keygeneration.cpp | 8 ++++---- src/twcrypto/crypto.cpp | 10 +++++----- src/twcrypto/crypto.h | 4 ++-- src/twcrypto/keyfile.cpp | 2 +- src/twparser/parserhelper.cpp | 8 ++++---- src/twparser/policyparser.cpp | 4 ++-- src/twparser/yylex.cpp | 4 ++-- src/twtest/cmdlineparser_t.cpp | 6 +++--- src/twtest/hashtable_t.cpp | 2 +- 52 files changed, 114 insertions(+), 114 deletions(-) diff --git a/src/core/archive.cpp b/src/core/archive.cpp index ab4e7cf..95b0f5f 100644 --- a/src/core/archive.cpp +++ b/src/core/archive.cpp @@ -421,7 +421,7 @@ void cMemoryArchive::AllocateMemory(int len) // throw(eArchive) { // grow the buffer // only error if we are in debug mode -#ifdef _DEBUG +#ifdef DEBUG if (len > mMaxAllocatedLen) ThrowAndAssert(eArchiveOutOfMem()); #endif diff --git a/src/core/cmdlineparser.cpp b/src/core/cmdlineparser.cpp index 7da836b..3bd51f2 100644 --- a/src/core/cmdlineparser.cpp +++ b/src/core/cmdlineparser.cpp @@ -378,7 +378,7 @@ void cCmdLineParser::AddDependency(int argId1, int argId2, bool mutual ) /////////////////////////////////////////////////////////////////////////////// // TraceContents /////////////////////////////////////////////////////////////////////////////// -#ifdef _DEBUG +#ifdef DEBUG void cCmdLineParser::TraceContents(int dl) { cDebug d("cCmdLineParser::TraceContents"); diff --git a/src/core/cmdlineparser.h b/src/core/cmdlineparser.h index ed78009..6e990d0 100644 --- a/src/core/cmdlineparser.h +++ b/src/core/cmdlineparser.h @@ -139,7 +139,7 @@ public: // given an argId, fill out the strings with the argument and alias strings. Returns false // if the argId cannot be found. This method is not very fast, so don't use it often. - #ifdef _DEBUG + #ifdef DEBUG void TraceContents(int dl = -1) ; #endif private: diff --git a/src/core/codeconvert.cpp b/src/core/codeconvert.cpp index 9142da1..73816f5 100644 --- a/src/core/codeconvert.cpp +++ b/src/core/codeconvert.cpp @@ -496,7 +496,7 @@ namespace /*Unique*/ d.TraceDebug( "Converted to: %s\n", util_output_bytes( (void*)pConvertedTo, nTo ).c_str() ); char aBuffer[ MB_LEN_MAX ]; -#ifdef _DEBUG +#ifdef DEBUG for( size_t foo = 0; foo < sizeof( aBuffer ); foo++ ) aBuffer[ foo ] = 0xCD; #endif @@ -651,7 +651,7 @@ namespace /*Unique*/ { cDebug d( "tss_Converter< BufferT, SourceT >()" ); -#ifdef _DEBUG +#ifdef DEBUG for( size_t s = nBufferItems; s; s-- ) pBuffer[s] = 0xCD; d.TraceDebug( "sizeof buffer: %d, sizeof source: %d\n", sizeof( BufferT ), sizeof( SourceT ) ); diff --git a/src/core/debug.cpp b/src/core/debug.cpp index 7c285bb..f56c3d4 100644 --- a/src/core/debug.cpp +++ b/src/core/debug.cpp @@ -307,7 +307,7 @@ void cDebug::DebugOut( const char* lpOutputString, ... ) vsnprintf(buf, 2048, lpOutputString, args); va_end(args); - #ifdef _DEBUG + #ifdef DEBUG TCERR << buf; #endif //_DEBUG diff --git a/src/core/debug.h b/src/core/debug.h index 499fcf7..1274d0a 100644 --- a/src/core/debug.h +++ b/src/core/debug.h @@ -156,11 +156,11 @@ private: #endif }; -#ifdef _DEBUG +#ifdef DEBUG #define TRACE cDebug::DebugOut #else #define TRACE 1 ? (void)0 : cDebug::DebugOut -#endif // _DEBUG +#endif // DEBUG ////////////////////////////////////////////////////////////////////////////////// // inline implementation diff --git a/src/core/errortable.cpp b/src/core/errortable.cpp index 6c7a24c..07fcb53 100644 --- a/src/core/errortable.cpp +++ b/src/core/errortable.cpp @@ -35,7 +35,7 @@ #include "stdcore.h" #include "errortable.h" -#ifdef _DEBUG +#ifdef DEBUG #include "package.h" #include "corestrings.h" #endif @@ -52,7 +52,7 @@ cErrorTable* cErrorTable::GetInstance() /////////////////////////////////////////////////////////////////////////////// // AssertMsgValidity /////////////////////////////////////////////////////////////////////////////// -#ifdef _DEBUG +#ifdef DEBUG void cErrorTable::AssertMsgValidity(const TCHAR* msg) { // Check to see that the first part of this error message is not too long. diff --git a/src/core/errortable.h b/src/core/errortable.h index dbd0632..b0e4012 100644 --- a/src/core/errortable.h +++ b/src/core/errortable.h @@ -66,14 +66,14 @@ public: static cErrorTable* GetInstance(); private: - #ifdef _DEBUG + #ifdef DEBUG static void AssertMsgValidity(const TCHAR* msg); #endif }; inline void cErrorTable::Put( const eError& e, const TCHAR* msg ) { - #ifdef _DEBUG + #ifdef DEBUG AssertMsgValidity(msg); #endif diff --git a/src/core/file_unix.cpp b/src/core/file_unix.cpp index d896cac..68705f1 100644 --- a/src/core/file_unix.cpp +++ b/src/core/file_unix.cpp @@ -322,7 +322,7 @@ cFile::File_t cFile::Seek( File_t offset, SeekFrom From) const //throw(eFile) if (fseeko( mpData->mpCurrStream, offset, apiFrom ) != 0) { - #ifdef _DEBUG + #ifdef DEBUG cDebug d("cFile::Seek"); d.TraceDebug("Seek failed!\n"); #endif diff --git a/src/core/fileheader.cpp b/src/core/fileheader.cpp index cf0fca3..3148e25 100644 --- a/src/core/fileheader.cpp +++ b/src/core/fileheader.cpp @@ -111,7 +111,7 @@ void cFileHeaderID::Write(iSerializer* pSerializer) const // throw (eSerializer, cFileHeader::cFileHeader() : mVersion(0) { -#ifdef _DEBUG +#ifdef DEBUG mEncoding = LAST_ENCODING; // set to invalid value so we can assert on write #else mEncoding = NO_ENCODING; @@ -213,7 +213,7 @@ void cFileHeader::Read(iSerializer* pSerializer, int32 /*version*/) // throw (eS void cFileHeader::Write(iSerializer* pSerializer) const // throw (eSerializer, eArchive) { -#ifdef _DEBUG +#ifdef DEBUG // check that we set some values cFileHeaderID id; ASSERT(mID != id); diff --git a/src/core/hashtable.h b/src/core/hashtable.h index 658905e..f28ade0 100644 --- a/src/core/hashtable.h +++ b/src/core/hashtable.h @@ -172,7 +172,7 @@ public: int32 GetNumValues() const { return mValuesInTable; }; // returns number of table entries filled -#ifdef _DEBUG +#ifdef DEBUG void TraceDiagnostics() const; // traces hash table statistics #endif @@ -503,7 +503,7 @@ uint32 cHashTable::Hash( const KEY_TY return hindex; } -#ifdef _DEBUG +#ifdef DEBUG template void cHashTable::TraceDiagnostics() const @@ -537,7 +537,7 @@ void cHashTable::TraceDiagnostics() c d.TraceDebug("-- Slots with >1 item: %d (%lf %%)\n",numMultiSlot, ((double)numMultiSlot / (double)slotsFilled) * 100.0); d.TraceDebug("--------------------------------------------------\n"); } -#endif // _DEBUG +#endif // DEBUG #endif //__HASHTABLE_H diff --git a/src/core/ntmbs.cpp b/src/core/ntmbs.cpp index 647d285..1500634 100644 --- a/src/core/ntmbs.cpp +++ b/src/core/ntmbs.cpp @@ -46,7 +46,7 @@ // Module-wide Helpers //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#ifndef TSS_Raise // Should add file and line info in _DEBUG mode!!!! +#ifndef TSS_Raise // Should add file and line info in DEBUG mode!!!! #define TSS_Raise( Xcpt, pkg, ids ) \ throw Xcpt( TSS_GetString( pkg, ids ) ) diff --git a/src/core/package.h b/src/core/package.h index ac5e6a8..0745fe7 100644 --- a/src/core/package.h +++ b/src/core/package.h @@ -142,17 +142,17 @@ Messages m_messages // Decare a Stringtable -#ifdef _DEBUG +#ifdef DEBUG #define TSS_BeginStringtable( pkg ) \ void pkg::LoadStrings() \ { cDebug d( #pkg "::LoadStrings()" ); \ d.TraceDebug("Loading strings for " #pkg " package.\n"); \ Messages::Pair astr[] = { // Define a Stringtable -#else // _DEBUG +#else // DEBUG #define TSS_BeginStringtable( pkg ) \ void pkg::LoadStrings() \ { Messages::Pair astr[] = { // Define a Stringtable -#endif // _DEBUG +#endif // DEBUG #define TSS_EndStringtable( pkg ) \ }; m_messages.Put( \ diff --git a/src/core/refcountobj.cpp b/src/core/refcountobj.cpp index f8df324..575dcb1 100644 --- a/src/core/refcountobj.cpp +++ b/src/core/refcountobj.cpp @@ -41,7 +41,7 @@ #include "errorutil.h" -#ifdef _DEBUG +#ifdef DEBUG int cRefCountObj::objectCounter = 0; int cRefCountObj::referenceCounter = 0; @@ -68,7 +68,7 @@ struct cRefCountObj_Debug } } gRefCountObj_Debug; -#endif // _DEBUG +#endif // DEBUG cRefCountObj::cRefCountObj() { @@ -76,7 +76,7 @@ cRefCountObj::cRefCountObj() //std::cout << "Allocated RefObj(" << std::hex << (int)this << ")\n"; -#ifdef _DEBUG +#ifdef DEBUG ++objectCounter; ++referenceCounter; @@ -95,7 +95,7 @@ cRefCountObj::~cRefCountObj() //std::cout << "Deleted RefObj(" << std::hex << (int)this << ")\n"; -#ifdef _DEBUG +#ifdef DEBUG --objectCounter; cDebug d("cRefCountObj::~cRefCountObj"); d.TraceNever("Object Destroyed[%p] %s Objects Left = %d\n", this, typeid(*this).name(), objectCounter); @@ -128,7 +128,7 @@ void cRefCountObj::AddRef() const ++mRefCount; - #ifdef _DEBUG + #ifdef DEBUG ++referenceCounter; #endif } @@ -140,7 +140,7 @@ void cRefCountObj::Release() const Delete(); } - #ifdef _DEBUG + #ifdef DEBUG --referenceCounter; #endif } diff --git a/src/core/refcountobj.h b/src/core/refcountobj.h index 68f39f7..f96eb19 100644 --- a/src/core/refcountobj.h +++ b/src/core/refcountobj.h @@ -77,7 +77,7 @@ protected: private: mutable int mRefCount; -#ifdef _DEBUG +#ifdef DEBUG private: static int objectCounter; static int referenceCounter; diff --git a/src/core/resources.h b/src/core/resources.h index 6ef4161..cd19ea5 100644 --- a/src/core/resources.h +++ b/src/core/resources.h @@ -241,7 +241,7 @@ Resource_Class::Get( ConstKeyRef id ) const if ( at == m_table.end() ) { - #ifdef _DEBUG + #ifdef DEBUG std::cerr << "*** Error Resource_Class::Get() [" __FILE__ ":" << __LINE__ << "]: Resource not found\n"; #endif diff --git a/src/core/serializerimpl.cpp b/src/core/serializerimpl.cpp index 8c9aaa0..af382b4 100644 --- a/src/core/serializerimpl.cpp +++ b/src/core/serializerimpl.cpp @@ -274,7 +274,7 @@ iTypedSerializable* cSerializerImpl::ReadObjectDynCreate() // unable to find the creation function... d.TraceError("Unable to find creation function for non-ref counted object %d\n", crc); TOSTRINGSTREAM str; - #ifdef _DEBUG + #ifdef DEBUG // Let's only report the actual crc in debug mode str << (int32)crc << std::ends; #endif diff --git a/src/core/srefcounttbl.cpp b/src/core/srefcounttbl.cpp index 3e88c88..4c59477 100644 --- a/src/core/srefcounttbl.cpp +++ b/src/core/srefcounttbl.cpp @@ -119,7 +119,7 @@ int cSerRefCountTable::Add(const iSerRefCountObj* pObj, int id) // creates a new cSerRefCountTable void cSerRefCountTableMap::AddSerializer(const cSerializer* pSerializer) { - #ifdef _DEBUG + #ifdef DEBUG // make sure we don't have this serialzier in here yet { std::map::iterator itr; diff --git a/src/core/stdcore.h b/src/core/stdcore.h index fc5848b..44be2c4 100644 --- a/src/core/stdcore.h +++ b/src/core/stdcore.h @@ -62,7 +62,7 @@ #pragma warning( disable: 4100 ) // Formal argument not used #pragma warning( disable: 4710 ) // Compiler did not inline function -#ifndef _DEBUG // ASSERT's are disabled give a lot of these +#ifndef DEBUG // ASSERT's are disabled give a lot of these #pragma warning( disable: 4702 ) // ---Unreachable Code #endif diff --git a/src/db/blockfile.cpp b/src/db/blockfile.cpp index d87f3d4..5713e22 100644 --- a/src/db/blockfile.cpp +++ b/src/db/blockfile.cpp @@ -326,7 +326,7 @@ void cBlockFile::AssertValid() const // // make sure the archive length and block count match up // - #ifdef _DEBUG + #ifdef DEBUG if (mpArchive->Length() != (GetBlockSize() * GetNumBlocks())) { cDebug d("cBlockFile::AssertValid"); diff --git a/src/db/blockfile.h b/src/db/blockfile.h index 884bb8f..975cf21 100644 --- a/src/db/blockfile.h +++ b/src/db/blockfile.h @@ -46,7 +46,7 @@ #include "block.h" #endif -#ifdef _DEBUG +#ifdef DEBUG #undef _BLOCKFILE_DEBUG // If we dont do this, test does not compile on unix #define _BLOCKFILE_DEBUG // If we dont do this, test does not compile on unix #endif diff --git a/src/fco/fconame.cpp b/src/fco/fconame.cpp index e73e8ac..1281bcd 100644 --- a/src/fco/fconame.cpp +++ b/src/fco/fconame.cpp @@ -97,7 +97,7 @@ cFCOName::cFCOName(iFCONameInfo* pNI) : { SetNameInfo(pNI); mpPathName = new cFCOName_i; -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); cDebug d("cFCOName::cFCOName(iFCONameInfo*)"); d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount()); @@ -111,7 +111,7 @@ cFCOName::cFCOName(const cFCOName& rhs) : mbCaseSensitive(rhs.mbCaseSensitive) { mpPathName->AddRef(); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); cDebug d("cFCOName::cFCOName(cFCOName&)"); d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount()); @@ -125,7 +125,7 @@ cFCOName::cFCOName(const TSTRING& rhs, iFCONameInfo* pNI) : mpPathName = new cFCOName_i; ParseString(rhs.c_str()); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); cDebug d("cFCOName::cFCOName(cFCOName&,iFCONameInfo*)"); d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount()); @@ -139,7 +139,7 @@ cFCOName::cFCOName(const TCHAR* rhs, iFCONameInfo* pNI) : mpPathName = new cFCOName_i; ParseString(rhs); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); cDebug d("cFCOName::cFCOName(cFCOName&,iFCONameInfo*)"); d.TraceNever(_T("constructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount()); @@ -148,7 +148,7 @@ cFCOName::cFCOName(const TCHAR* rhs, iFCONameInfo* pNI) : cFCOName::~cFCOName() { -#ifdef _DEBUG +#ifdef DEBUG cDebug d("cFCOName::~cFCOName()"); d.TraceNever(_T("destructing %X:%X %s (refcount=%d)\n"), this, mpPathName, mDebugStrName.c_str(), mpPathName->GetRefCount()); #endif @@ -168,7 +168,7 @@ void cFCOName::SetNameInfo(iFCONameInfo* pNI) mbCaseSensitive = iTWFactory::GetInstance()->GetNameInfo()->IsCaseSensitive(); mDelimiter = iTWFactory::GetInstance()->GetNameInfo()->GetDelimitingChar(); } -#ifdef _DEBUG +#ifdef DEBUG if( mpPathName != NULL ) // this could be called from the constructor before this is initialized. mDebugStrName = AsString(); #endif @@ -185,7 +185,7 @@ cFCOName& cFCOName::operator = (const cFCOName& rhs) mpPathName->AddRef(); mDelimiter = rhs.mDelimiter; mbCaseSensitive = rhs.mbCaseSensitive; -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif return *this; @@ -194,7 +194,7 @@ cFCOName& cFCOName::operator = (const cFCOName& rhs) cFCOName& cFCOName::operator = (const TSTRING& rhs) { *this = rhs.c_str(); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif return *this; @@ -210,7 +210,7 @@ cFCOName& cFCOName::operator = (const TCHAR* rhs) mpPathName = new cFCOName_i; } ParseString(rhs); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif return *this; @@ -320,7 +320,7 @@ void cFCOName::Clear() { Pop(); } -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif } @@ -392,7 +392,7 @@ void cFCOName::Read(iSerializer* pSerializer, int32 version) mbCaseSensitive = true; ParseString(str.c_str()); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif } @@ -443,7 +443,7 @@ void cFCOName::Push(const TSTRING& str) cFCONameTblNode* pNode = cFCOName_i::msNameTbl.CreateNode(str); mpPathName->mNames.push_back(pNode); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif } @@ -465,7 +465,7 @@ const TCHAR* cFCOName::Pop() ASSERT(pNode->GetRefCount() > 1); const TCHAR* ret = pNode->GetString(); pNode->Release(); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif return ret; @@ -489,7 +489,7 @@ const TCHAR* cFCOName::PopFront() ASSERT(pNode->GetRefCount() > 1); const TCHAR* ret = pNode->GetString(); pNode->Release(); -#ifdef _DEBUG +#ifdef DEBUG mDebugStrName = AsString(); #endif return ret; diff --git a/src/fco/fconame.h b/src/fco/fconame.h index daccab0..0ce68fb 100644 --- a/src/fco/fconame.h +++ b/src/fco/fconame.h @@ -153,7 +153,7 @@ protected: // typedef std::vector ListType; -#ifdef _DEBUG +#ifdef DEBUG TSTRING mDebugStrName; // so we can see this guy's value in the debug window #endif }; diff --git a/src/fco/fconametbl.cpp b/src/fco/fconametbl.cpp index a331533..1bcfbeb 100644 --- a/src/fco/fconametbl.cpp +++ b/src/fco/fconametbl.cpp @@ -156,7 +156,7 @@ cFCONameTbl::cFCONameTbl(int defSize) : cFCONameTbl::~cFCONameTbl() { -#ifdef _DEBUG +#ifdef DEBUG cDebug d("cFCONameTbl::~cFCONameTbl()"); d.TraceDebug("Tracing cFCONameTblNode hash table statistics:\n"); mTable.TraceDiagnostics(); diff --git a/src/fco/fcosetws.h b/src/fco/fcosetws.h index 8f3f8be..5b71e30 100644 --- a/src/fco/fcosetws.h +++ b/src/fco/fcosetws.h @@ -112,7 +112,7 @@ inline void cFCOSetWS::SetSpec(const iFCOSpec* pSpec) inline void cFCOSetWS::Insert(iFCO* pFCO) { // here is the only real work this class does! -#ifdef _DEBUG +#ifdef DEBUG // TODO -- note that this doesn't do any checking if the spec is NULL. I // am not sure if this is the right thing to do or not. if(mpSpec) @@ -127,7 +127,7 @@ inline void cFCOSetWS::Insert(iFCO* pFCO) mpSpec->TraceContents(cDebug::D_ERROR); } } -#endif // _DEBUG +#endif // DEBUG cFCOSetImpl::Insert(pFCO); } diff --git a/src/fco/fcospecimpl.cpp b/src/fco/fcospecimpl.cpp index 839e282..d696372 100644 --- a/src/fco/fcospecimpl.cpp +++ b/src/fco/fcospecimpl.cpp @@ -41,7 +41,7 @@ #include "fcospechelper.h" #include "core/errorutil.h" -#ifdef _DEBUG +#ifdef DEBUG int gFCOSpecImplCreated = 0; int gFCOSpecImplDestroyed = 0; #endif @@ -53,7 +53,7 @@ cFCOSpecImpl::cFCOSpecImpl(const TSTRING& name, void* pSrc, iFCOSpecHelper* pHel mName(name), mpHelper(pHelper) { -#ifdef _DEBUG +#ifdef DEBUG ++gFCOSpecImplCreated; cDebug d("cFCOSpecImpl::cFCOSpecImpl()"); d.TraceDetail("Allocated cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed); @@ -65,7 +65,7 @@ cFCOSpecImpl::cFCOSpecImpl() : mName(_T("Unnamed_FCOSpecImpl")), mpHelper(0) { -#ifdef _DEBUG +#ifdef DEBUG ++gFCOSpecImplCreated; cDebug d("cFCOSpecImpl::cFCOSpecImpl()"); d.TraceDetail("Allocated cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed); @@ -77,7 +77,7 @@ cFCOSpecImpl::cFCOSpecImpl(const cFCOSpecImpl& rhs) : mpHelper(0) { *this = rhs; -#ifdef _DEBUG +#ifdef DEBUG ++gFCOSpecImplCreated; cDebug d("cFCOSpecImpl::cFCOSpecImpl()"); d.TraceDetail("Allocated cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed); @@ -86,7 +86,7 @@ cFCOSpecImpl::cFCOSpecImpl(const cFCOSpecImpl& rhs) : cFCOSpecImpl::~cFCOSpecImpl() { -#ifdef _DEBUG +#ifdef DEBUG ++gFCOSpecImplDestroyed; cDebug d("cFCOSpecImpl::cFCOSpecImpl()"); d.TraceDetail("Deleted cFCOSpecImpl(%p) creat=%d dest=%d\n", this, gFCOSpecImplCreated, gFCOSpecImplDestroyed); diff --git a/src/fco/signature.cpp b/src/fco/signature.cpp index 4278ed1..4fee4d6 100644 --- a/src/fco/signature.cpp +++ b/src/fco/signature.cpp @@ -267,7 +267,7 @@ void cNullSignature::Read(iSerializer* pSerializer, int32 version) if (version > Version()) ThrowAndAssert(eSerializerVersionMismatch(_T("Null Signature Read"))); -#ifdef _DEBUG +#ifdef DEBUG int16 ret; pSerializer->ReadInt16(ret); ASSERT(ret == 123); @@ -276,7 +276,7 @@ void cNullSignature::Read(iSerializer* pSerializer, int32 version) void cNullSignature::Write(iSerializer* pSerializer) const { -#ifdef _DEBUG +#ifdef DEBUG pSerializer->WriteInt16(123); #endif } diff --git a/src/fs/fsobject.cpp b/src/fs/fsobject.cpp index c811d77..bb18991 100644 --- a/src/fs/fsobject.cpp +++ b/src/fs/fsobject.cpp @@ -45,7 +45,7 @@ IMPLEMENT_SERREFCOUNT(cFSObject, _T("FSObject"), 0, 1) // Debug stuff -#ifdef _DEBUG +#ifdef DEBUG static int gNumFSObjectCreate = 0; static int gNumFSObjectDestroy = 0; @@ -75,7 +75,7 @@ public: cFSObject::cFSObject(const cFCOName& name) : mName(name) { -#ifdef _DEBUG +#ifdef DEBUG gNumFSObjectCreate++; #endif } @@ -83,14 +83,14 @@ cFSObject::cFSObject(const cFCOName& name) : cFSObject::cFSObject() : mName(_T("undefined")) { -#ifdef _DEBUG +#ifdef DEBUG gNumFSObjectCreate++; #endif } cFSObject::~cFSObject() { -#ifdef _DEBUG +#ifdef DEBUG gNumFSObjectDestroy++; #endif } diff --git a/src/fs/fsobject.h b/src/fs/fsobject.h index 9121137..f66deaa 100644 --- a/src/fs/fsobject.h +++ b/src/fs/fsobject.h @@ -82,7 +82,7 @@ public: virtual void TraceContents(int dl = -1) const; -#ifdef _DEBUG +#ifdef DEBUG static void TraceStats() ; // this TRACEs statistics on FSObject usage that is pertinent to performance or mem leakage // concerns. diff --git a/src/fs/fspropcalc.cpp b/src/fs/fspropcalc.cpp index ad4063a..ad1446b 100644 --- a/src/fs/fspropcalc.cpp +++ b/src/fs/fspropcalc.cpp @@ -399,7 +399,7 @@ void cFSPropCalc::VisitFSObject(cFSObject& obj) propsToCheck ^= inBoth; } -#ifdef _DEBUG +#ifdef DEBUG d.TraceDetail("----->Collision Action = %s\n", mCollAction == iFCOPropCalc::PROP_LEAVE ? "Leave" : "Replace"); d.TraceDetail("----->Object's valid properties (a):\n"); obj.GetPropSet()->GetValidVector().TraceContents(cDebug::D_DETAIL); diff --git a/src/parser/tokens.l b/src/parser/tokens.l index 94bc773..536ba91 100644 --- a/src/parser/tokens.l +++ b/src/parser/tokens.l @@ -311,12 +311,12 @@ END {WS}*{DIRECTIVE}{WS}*end *mpstring = strW; -#ifdef _DEBUG +#ifdef DEBUG TSTRING strDisplay = *mpstring; cDisplayEncoder e; e.Encode( strDisplay ); d.TraceDetail("interpreted as --> <%s>\n", strDisplay.c_str()); -#endif // _DEBUG +#endif // DEBUG // attach to lval yylval.mpString = mpstring; diff --git a/src/tripwire/integritycheck.cpp b/src/tripwire/integritycheck.cpp index 224c14c..815cd15 100644 --- a/src/tripwire/integritycheck.cpp +++ b/src/tripwire/integritycheck.cpp @@ -324,7 +324,7 @@ void cIntegrityCheck::ProcessDir( cDbDataSourceIter dbIter, iFCODataSourceIter* return; } -#ifdef _DEBUG +#ifdef DEBUG if( dbIter.Done() ) { d.TraceDebug( "Processing directory %s\n", pIter->GetParentName().AsString().c_str() ); diff --git a/src/tripwire/tripwiremain.cpp b/src/tripwire/tripwiremain.cpp index 266199d..89649b9 100644 --- a/src/tripwire/tripwiremain.cpp +++ b/src/tripwire/tripwiremain.cpp @@ -64,7 +64,7 @@ static TSTRING util_GetWholeCmdLine( int argc, const TCHAR *argv[] ); // global new() and delete() overrides -- this is done to do performance testing /////////////////////////////////////////////////////////////////////////////// /* -#ifdef _DEBUG +#ifdef DEBUG #if defined(HAVE_MALLOC_H) #include #endif @@ -269,7 +269,7 @@ exit: // print out the max memory usage... /* -#ifdef _DEBUG +#ifdef DEBUG TCOUT << _T("Maximum memory footprint = ") << gMaxAlloc << std::endl; #endif */ diff --git a/src/tripwire/twcmdline.cpp b/src/tripwire/twcmdline.cpp index 5666533..a97baaf 100644 --- a/src/tripwire/twcmdline.cpp +++ b/src/tripwire/twcmdline.cpp @@ -158,7 +158,7 @@ iTWMode* cTWCmdLine::GetMode(int argc, const TCHAR *const * argv) else if (_tcscmp(argv[1], _T("--test")) == 0) mode = MODE_TEST; -#ifdef _DEBUG_DB +#ifdef DEBUG if (_tcscmp(argv[1], _T("--explore")) == 0) mode = MODE_EXPLORE; if (_tcscmp(argv[1], _T("--verifydb")) == 0) @@ -204,8 +204,8 @@ iTWMode* cTWCmdLine::GetMode(int argc, const TCHAR *const * argv) pRtn = new cTWModeVersion; break; -//Explore and Debug modes are invisible unless _DEBUG_DB is defined. -#ifdef _DEBUG_DB +//Explore and Debug modes are invisible unless DEBUG is defined. +#ifdef DEBUG case cTWCmdLine::MODE_EXPLORE: pRtn = new cTWModeExploreDb; break; @@ -2441,7 +2441,7 @@ int cTWModeHelp::Execute(cErrorQueue* pQueue) TCOUT<< TSS_GetString( cTripwire, tripwire::STR_TRIPWIRE_HELP_UPDATE ); TCOUT<< TSS_GetString( cTripwire, tripwire::STR_TRIPWIRE_HELP_UPDATE_POLICY ); TCOUT<< TSS_GetString( cTripwire, tripwire::STR_TRIPWIRE_HELP_TEST ); -#ifdef _DEBUG_DB +#ifdef DEBUG // TODO: Do we need help messages for these modes? DRA #endif //We're done, return @@ -2539,7 +2539,7 @@ bool util_GetEditor( TSTRING& strEd ) //Encase the explore and debug modes in this ifdef, since they are for internal //use only. -#ifdef _DEBUG_DB +#ifdef DEBUG //############################################################################# // cTWModeExploreDb @@ -2724,6 +2724,6 @@ int cTWModeDebugDb::Execute(cErrorQueue* pQueue) } -#endif //_DEBUG_DB +#endif //DEBUG diff --git a/src/tripwire/twcmdline.h b/src/tripwire/twcmdline.h index 1dd1c45..e68d677 100644 --- a/src/tripwire/twcmdline.h +++ b/src/tripwire/twcmdline.h @@ -361,8 +361,8 @@ private: cTWModeHelp_i* mpData; }; -//These two modes are invisible if _DEBUG_DB is not defined. -#ifdef _DEBUG_DB +//These two modes are invisible if DEBUG is not defined. +#ifdef DEBUG /////////////////////////////////////////////////////////////////////////////// // Explore Db @@ -404,7 +404,7 @@ private: cTWModeDebugDb_i* mpData; }; -#endif //_DEBUG_DB +#endif //DEBUG /////////////////////////////////////////////////////////////////////////////// // Version Mode diff --git a/src/tw/configfile.cpp b/src/tw/configfile.cpp index af13e78..9e4c0fc 100644 --- a/src/tw/configfile.cpp +++ b/src/tw/configfile.cpp @@ -238,7 +238,7 @@ void cConfigFile::WriteString( TSTRING& configText ) // throw( eFSServices ) void cConfigFile::ReadString(const TSTRING configText) // throw( eConfigFile ); { -#ifdef _DEBUG +#ifdef DEBUG // NOTE:BAM -- debug only code ! TCERR << _T("*** begin config text ***") << std::endl; TCERR << configText << std::endl; @@ -266,7 +266,7 @@ void cConfigFile::ReadString(const TSTRING configText) // throw( eConfigFile ); CheckThatAllMandatoryKeyWordsExists(); -#ifdef _DEBUG +#ifdef DEBUG // NOTE:BAM -- debug only code ! TSTRING sTemp; WriteString( sTemp ); diff --git a/src/tw/dbdatasource.cpp b/src/tw/dbdatasource.cpp index db2f2b6..2f96ca9 100644 --- a/src/tw/dbdatasource.cpp +++ b/src/tw/dbdatasource.cpp @@ -64,14 +64,14 @@ cDbDataSourceIter::cDbDataSourceIter(cHierDatabase* pDb, int genreNum ) genreNum = cGenreSwitcher::GetInstance()->CurrentGenre(); mFCOCreateFunc = cGenreSwitcher::GetInstance()->GetFactoryForGenre( (cGenre::Genre)genreNum )->GetCreateFunc(); -#ifdef _DEBUG +#ifdef DEBUG // // make some assertions about the current genre's name info // iFCONameInfo* pNameInfo = cGenreSwitcher::GetInstance()->GetFactoryForGenre( (cGenre::Genre)genreNum )->GetNameInfo(); ASSERT( pDb->IsCaseSensitive() == pNameInfo->IsCaseSensitive() ); ASSERT( pDb->GetDelimitingChar() == pNameInfo->GetDelimitingChar() ); -#endif //#ifdef _DEBUG +#endif //#ifdef DEBUG } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/tw/fcodatabasefile.cpp b/src/tw/fcodatabasefile.cpp index d36a5c2..65e6b89 100644 --- a/src/tw/fcodatabasefile.cpp +++ b/src/tw/fcodatabasefile.cpp @@ -62,7 +62,7 @@ cFCODatabaseFile::tEntry::tEntry( cGenre::Genre genre ) } cFCODatabaseFile::cFCODatabaseFile() -#ifdef _DEBUG +#ifdef DEBUG : mFileName( _T("Unknown file name") ) #else : mFileName( _T("") ) // If we don't know the filename, lets just not have one in release mode. diff --git a/src/tw/fcoreport.cpp b/src/tw/fcoreport.cpp index b66c231..c9534f4 100644 --- a/src/tw/fcoreport.cpp +++ b/src/tw/fcoreport.cpp @@ -722,7 +722,7 @@ void cFCOReport::AddChangedFCO(const cFCOReportSpecIter& iter, const iFCO* pOldF // make some assertions about the iterator - #ifdef _DEBUG + #ifdef DEBUG // make sure iter points to one of our spec lists cFCOReport_i::GenreSpecList::iterator genreIter; for (genreIter = mpData->mGenreList.begin(); ; ++genreIter) diff --git a/src/tw/textreportviewer.cpp b/src/tw/textreportviewer.cpp index d1e8b61..f633d45 100644 --- a/src/tw/textreportviewer.cpp +++ b/src/tw/textreportviewer.cpp @@ -2006,7 +2006,7 @@ void cTextReportViewer::GetChar() // sequence was not a valid mb character // (searched MB_CUR_MAX chars and didn't find a complete mb character) d.TraceDebug( _T("Invalid mb char found!\n") ); -#ifdef _DEBUG +#ifdef DEBUG for( int j = 0; j < MB_CUR_MAX; j++ ) d.TraceDebug( _T("%u\n"), (size_t)(unsigned char)mCurrentChar[j] ); #endif diff --git a/src/tw/twinit.cpp b/src/tw/twinit.cpp index cac48aa..06fbafa 100644 --- a/src/tw/twinit.cpp +++ b/src/tw/twinit.cpp @@ -292,7 +292,7 @@ void cTWInit::Init( const TSTRING& strArgv0 ) tw_HandleSignal( SIGSEGV ); // Segmentation fault tw_HandleSignal( SIGQUIT ); // Quit signal - issued from terminal (CTRL-\) tw_HandleSignal( SIGILL ); // Illegal instruction - probably won't be an issue. -#ifndef _DEBUG +#ifndef DEBUG tw_HandleSignal( SIGTRAP ); // We don't want to mess up the debugger in debug builds... #endif tw_HandleSignal( SIGABRT ); // Supposedly we can only get this signal by calling abort() diff --git a/src/tw/twstrings.cpp b/src/tw/twstrings.cpp index 61ee236..6789fe2 100644 --- a/src/tw/twstrings.cpp +++ b/src/tw/twstrings.cpp @@ -42,7 +42,7 @@ #define UNICODE_STR _T("") -#ifdef _DEBUG +#ifdef DEBUG # define DEBUG_STR _T("d") #else # define DEBUG_STR _T("") diff --git a/src/tw/twutil.cpp b/src/tw/twutil.cpp index 62a25f3..f227e6b 100644 --- a/src/tw/twutil.cpp +++ b/src/tw/twutil.cpp @@ -1126,7 +1126,7 @@ static struct termios Otty; static void RestoreEcho(int sig) { #if SUPPORTS_TERMIOS -#ifdef _DEBUG +#ifdef DEBUG std::cout << "Caught signal, resetting echo."<< std::endl; sleep(2); #endif diff --git a/src/twadmin/keygeneration.cpp b/src/twadmin/keygeneration.cpp index b858d4e..2f304bd 100644 --- a/src/twadmin/keygeneration.cpp +++ b/src/twadmin/keygeneration.cpp @@ -85,7 +85,7 @@ static void GeneratePublicPrivateKeys(void* pParams, const cElGamalSig::KeySize try { cKeyFile keyfile; -#ifdef _DEBUG +#ifdef DEBUG cDebug d("GeneratePublicPrivateKeys"); d.TraceDebug("calling keyfile.GenerateKeys()\n"); #endif @@ -101,7 +101,7 @@ static void GeneratePublicPrivateKeys(void* pParams, const cElGamalSig::KeySize return; } -#ifdef _DEBUG +#ifdef DEBUG d.TraceDebug(_T("writing to keyfile %s\n"), pGK->keyPath); #endif @@ -135,7 +135,7 @@ bool GenerateKey(const TCHAR* keyPath, wc16_string passphrase, const cElGamalSig passphrase.swapbytes(); #endif -#ifdef _DEBUG +#ifdef DEBUG // test reading in the keys wc16_string passphrase_copy = passphrase.c_str(); wc16_string passphrase_copy2 = passphrase.c_str(); @@ -169,7 +169,7 @@ bool GenerateKey(const TCHAR* keyPath, wc16_string passphrase, const cElGamalSig return false; } -#ifdef _DEBUG +#ifdef DEBUG // test reading in the keys cKeyFile keyfile; diff --git a/src/twcrypto/crypto.cpp b/src/twcrypto/crypto.cpp index 92dbf25..a655794 100644 --- a/src/twcrypto/crypto.cpp +++ b/src/twcrypto/crypto.cpp @@ -476,7 +476,7 @@ void cRSAPublicKey::Write(void* pDataStream) const WRITE_INTEGER(e); } -#ifdef _DEBUG +#ifdef DEBUG void cRSAPublicKey::TraceContents() { cDebug d("cRSAPublicKey::TraceContents"); @@ -687,7 +687,7 @@ void cRSA::GenerateKeys(cRSAPrivateKey*& retPrivate, cRSAPublicKey*& retPublic) retPublic->mpData->mpKey = pNewPublicKey; retPublic->mpData->mKeyLength = mpData->mKeyBits; -#ifdef _DEBUG +#ifdef DEBUG int l; l = retPublic->mpData->mpKey->MaxPlainTextLength(); ASSERT(l == GetBlockSizePlain()); @@ -954,7 +954,7 @@ bool cElGamalSigPublicKey::IsEqual(const cElGamalSigPublicKey& rhs) const ; } -#ifdef _DEBUG +#ifdef DEBUG void cElGamalSigPublicKey::TraceContents() { cDebug d("cElGamalSigPublicKey::TraceContents"); @@ -1167,7 +1167,7 @@ void cElGamalSig::GenerateKeys(cElGamalSigPrivateKey*& retPrivate, cElGamalSigPu retPublic->mpData->mpKey = pNewPublicKey; retPublic->mpData->mKeyLength = (int16)mpData->mKeyBits; -#ifdef _DEBUG +#ifdef DEBUG int l; l = retPublic->mpData->mpKey->SignatureLength(); ASSERT(l + PLAIN_BLOCK_SIZE <= GetBlockSizeCipher()); @@ -1250,7 +1250,7 @@ void RandomizeBytes(int8* destbuf, int len) for (mask = 0xb147688c; time(NULL) - start < 1; mask += 0x8984cc88) ; - #ifdef _DEBUG + #ifdef DEBUG time_t t = time(NULL); t ^= mask; diff --git a/src/twcrypto/crypto.h b/src/twcrypto/crypto.h index ddd5d13..4373fc7 100644 --- a/src/twcrypto/crypto.h +++ b/src/twcrypto/crypto.h @@ -209,7 +209,7 @@ public: int GetWriteLen() const; void Write(void* pDataStream) const; -#ifdef _DEBUG +#ifdef DEBUG void TraceContents(); #endif @@ -315,7 +315,7 @@ public: // This is used to make sure the key used to sign the config // file is the same as the key we are currently using. -#ifdef _DEBUG +#ifdef DEBUG void TraceContents(); #endif diff --git a/src/twcrypto/keyfile.cpp b/src/twcrypto/keyfile.cpp index 1c6ec9e..12d7767 100644 --- a/src/twcrypto/keyfile.cpp +++ b/src/twcrypto/keyfile.cpp @@ -398,7 +398,7 @@ void cKeyFile::ProtectKeys(int8* passphrase, int passphraseLen) // throw eKeyFil des.ProcessBlock(mpPrivateKeyMem + i, mpPrivateKeyMem + i); } -#ifdef _DEBUG +#ifdef DEBUG // try decoding it just to see if it worked if (GetPrivateKey(passphrase, passphraseLen) == 0) { diff --git a/src/twparser/parserhelper.cpp b/src/twparser/parserhelper.cpp index 3415907..155d07b 100644 --- a/src/twparser/parserhelper.cpp +++ b/src/twparser/parserhelper.cpp @@ -64,7 +64,7 @@ static bool util_IsOctal( const char ch ); static int util_GetEscapeValueOfChar( char ch ); static int util_GetRecurseDepth( const cParseNamedAttrList* pList ); //throw( eParserHelper ) static void util_LoseSurroundingWS( TSTRING& str ); -#ifdef _DEBUG +#ifdef DEBUG static bool util_AsciiCharsActLikeTheyShould(); #endif @@ -226,7 +226,7 @@ void cPreprocessor::PopState() ASSERT( ! mStateStack.empty() ); mStateStack.pop(); -#ifdef _DEBUG +#ifdef DEBUG if( !Empty() && TopState() == STATE_ACCEPT ) d.TraceDebug(_T("State == STATE_ACCEPT\n")); else @@ -502,7 +502,7 @@ void cParserUtil::InterpretEscapedString( const std::string& strEscapedString, T } } -#ifdef _DEBUG +#ifdef DEBUG std::string str; str = "before: <"; @@ -1085,7 +1085,7 @@ void util_LoseSurroundingWS( TSTRING& str ) } -#ifdef _DEBUG +#ifdef DEBUG bool util_AsciiCharsActLikeTheyShould() { // we need numbers whose character diff --git a/src/twparser/policyparser.cpp b/src/twparser/policyparser.cpp index bdedd97..080c4a4 100644 --- a/src/twparser/policyparser.cpp +++ b/src/twparser/policyparser.cpp @@ -170,7 +170,7 @@ std::string cPolicyParser::ConvertMultibyte( std::istream& in ) throw eParserBadCharacter(); } -#ifdef _DEBUG +#ifdef DEBUG TCERR << _T("*** begin policy text ***") << std::endl; std::cerr << ss.str() << std::endl; TCERR << _T("*** end policy text ***") << std::endl << std::endl; @@ -179,7 +179,7 @@ std::string cPolicyParser::ConvertMultibyte( std::istream& in ) // convert it to single byte escaped std::string str = util_ConvertMB( ss.str() ); -#ifdef _DEBUG +#ifdef DEBUG TCERR << _T("*** begin policy converted to ***") << std::endl; std::cerr << str << std::endl; TCERR << _T("*** end policy converted to ***") << std::endl << std::endl; diff --git a/src/twparser/yylex.cpp b/src/twparser/yylex.cpp index ed66a60..5356335 100644 --- a/src/twparser/yylex.cpp +++ b/src/twparser/yylex.cpp @@ -1121,12 +1121,12 @@ yy_scan::yylex() *mpstring = strW; -#ifdef _DEBUG +#ifdef DEBUG TSTRING strDisplay = *mpstring; cDisplayEncoder e; e.Encode( strDisplay ); d.TraceDetail("interpreted as --> <%s>\n", strDisplay.c_str()); -#endif // _DEBUG +#endif // DEBUG // attach to lval yylval.mpString = mpstring; diff --git a/src/twtest/cmdlineparser_t.cpp b/src/twtest/cmdlineparser_t.cpp index 8996d80..4d32ca5 100644 --- a/src/twtest/cmdlineparser_t.cpp +++ b/src/twtest/cmdlineparser_t.cpp @@ -88,7 +88,7 @@ const TCHAR* argv5[] = _T("frog") }; -#ifdef _DEBUG +#ifdef DEBUG static void PrintCmdLine(int argc, const TCHAR** argv, cDebug d) { TSTRING str; @@ -104,7 +104,7 @@ static void PrintCmdLine(int argc, const TCHAR** argv, cDebug d) static void test_parse(cCmdLineParser& parser, const int argc, const TCHAR** argv, bool should_throw) { -#ifdef _DEBUG +#ifdef DEBUG cDebug d("test_parse"); PrintCmdLine(argc, argv, d); #endif @@ -122,7 +122,7 @@ static void test_parse(cCmdLineParser& parser, const int argc, const TCHAR** arg TEST(threw == should_throw); -#ifdef _DEBUG +#ifdef DEBUG parser.TraceContents(); #endif } diff --git a/src/twtest/hashtable_t.cpp b/src/twtest/hashtable_t.cpp index 4db455f..f5ef5cb 100644 --- a/src/twtest/hashtable_t.cpp +++ b/src/twtest/hashtable_t.cpp @@ -110,7 +110,7 @@ void HashTest1() } // get statistics -#ifdef _DEBUG +#ifdef DEBUG htable.TraceDiagnostics(); #endif