generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-02 09:49:48 +02:00
Code Issues Projects Releases Wiki Activity

use _DEBUG instead of DEBUG macro in [Simple]HashTable

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-10-06 07:35:04 +02:00
parent 2808fec7c3
commit d66fde51b5
2 changed files with 6 additions and 5 deletions
Foundation/include/Poco
HashTable.hSimpleHashTable.h

6
Foundation/include/Poco/HashTable.h

@ -327,7 +327,7 @@ public:
UInt32 numZeroEntries = 0; UInt32 numZeroEntries = 0;
UInt32 maxEntriesPerHash = 0; UInt32 maxEntriesPerHash = 0;
std::vector<UInt32> detailedEntriesPerHash; std::vector<UInt32> detailedEntriesPerHash;
#ifdef DEBUG #ifdef _DEBUG
UInt32 totalSize = 0; UInt32 totalSize = 0;
#endif #endif
for (UInt32 i = 0; i < _maxCapacity; ++i) for (UInt32 i = 0; i < _maxCapacity; ++i)
@ -340,7 +340,7 @@ public:
maxEntriesPerHash = size; maxEntriesPerHash = size;
if (details) if (details)
detailedEntriesPerHash.push_back(size); detailedEntriesPerHash.push_back(size);
#ifdef DEBUG #ifdef _DEBUG
totalSize += size; totalSize += size;
#endif #endif
} }
@ -351,7 +351,7 @@ public:
detailedEntriesPerHash.push_back(0); detailedEntriesPerHash.push_back(0);
} }
} }
#ifdef DEBUG #ifdef _DEBUG
poco_assert_dbg(totalSize == numberOfEntries); poco_assert_dbg(totalSize == numberOfEntries);
#endif #endif
return HashStatistic(_maxCapacity, numberOfEntries, numZeroEntries, maxEntriesPerHash, detailedEntriesPerHash); return HashStatistic(_maxCapacity, numberOfEntries, numZeroEntries, maxEntriesPerHash, detailedEntriesPerHash);

5
Foundation/include/Poco/SimpleHashTable.h

@ -369,7 +369,7 @@ public:
UInt32 size = 1; UInt32 size = 1;
if (details) if (details)
detailedEntriesPerHash.push_back(size); detailedEntriesPerHash.push_back(size);
#ifdef DEBUG #ifdef _DEBUG
totalSize += size; totalSize += size;
#endif #endif
} }
@ -380,8 +380,9 @@ public:
detailedEntriesPerHash.push_back(0); detailedEntriesPerHash.push_back(0);
} }
} }
#ifdef _DEBUG
poco_assert_dbg(totalSize == numberOfEntries); poco_assert_dbg(totalSize == numberOfEntries);
#endif
return HashStatistic(_capacity, numberOfEntries, numZeroEntries, maxEntriesPerHash, detailedEntriesPerHash); return HashStatistic(_capacity, numberOfEntries, numZeroEntries, maxEntriesPerHash, detailedEntriesPerHash);
} }