From e041ce574baf68b90b100f2d6a36724919559f89 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Mon, 8 Nov 1999 15:23:41 +0000 Subject: [PATCH] Fixed __WXDEBUG__ references to use #ifdef rather than checking for it being greater than 0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/db.cpp | 4 ++-- src/common/dbtable.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/common/db.cpp b/src/common/db.cpp index 4f9cd1dc41..78b9dc7db5 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -92,7 +92,7 @@ DbList WXDLLEXPORT *PtrBegDbList = 0; -#if __WXDEBUG__ > 0 +#ifdef __WXDEBUG__ extern wxList TablesInUse; #endif @@ -763,7 +763,7 @@ void wxDB::Close(void) // There should be zero Ctable objects still connected to this db object assert(nTables == 0); -#if __WXDEBUG__ > 0 +#ifdef __WXDEBUG__ CstructTablesInUse *tiu; wxNode *pNode; pNode = TablesInUse.First(); diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index 1381c8ff74..51ff59a1a2 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -95,7 +95,7 @@ ULONG lastTableID = 0; -#if __WXDEBUG__ > 0 +#ifdef __WXDEBUG__ wxList TablesInUse; #endif @@ -144,7 +144,7 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols, tableID = ++lastTableID; sprintf(s, "wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb); -#if __WXDEBUG__ > 0 +#ifdef __WXDEBUG__ CstructTablesInUse *tableInUse; tableInUse = new CstructTablesInUse(); tableInUse->tableName = tblName; @@ -250,8 +250,7 @@ wxTable::~wxTable() pDb->WriteSqlLog(s); } -#ifndef PROGRAM_FP4UPG -#if __WXDEBUG__ > 0 +#ifdef __WXDEBUG__ if (tableID) { bool found = FALSE; @@ -276,7 +275,7 @@ wxTable::~wxTable() } } #endif -#endif + // Decrement the wxDB table count if (pDb) pDb->nTables--; -- 2.45.2