OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix pnUtils for clang.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-29 17:21:07 -08:00
parent 75a3701f3e
commit f58161ace0
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
View File

@ -823,7 +823,7 @@ void TArray<T,C>::AdjustSizeChunked (unsigned newAlloc, unsigned newCount) {
// Process growing the allocation
else
newAlloc = CalcAllocGrowth(newAlloc, this->m_alloc, &this->m_chunkSize);
newAlloc = this->CalcAllocGrowth(newAlloc, this->m_alloc, &this->m_chunkSize);
// Perform the allocation
this->AdjustSize(newAlloc, newCount);

3
Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
View File

@ -52,6 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnUtList.h"
#include "pnUtArray.h"
#include "pnUtMath.h"
#include "pnUtStr.h"
/****************************************************************************
*
@ -536,7 +537,7 @@ const T * THashTable<T,K>::Find (const K & key) const {
unsigned hash = key.GetHash();
const LIST(T) & slotList = this->GetSlotList(hash);
for (const T * curr = slotList.Head(); curr; curr = slotList.Next(curr))
if ((GetHash(curr) == hash) && (*curr == key))
if ((this->GetHash(curr) == hash) && (*curr == key))
return curr;
return nil;
}

39
Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
View File

@ -69,6 +69,25 @@ static uint32_t s_hashValue[] = {
* Internal functions
*
***/
//===========================================================================
template<class chartype>
static unsigned IStrLen (const chartype str[]) {
unsigned chars = 0;
for (; *str++; ++chars)
NULL_STMT;
return chars;
}
//===========================================================================
template<class chartype>
static void IStrCopy (chartype * dest, const chartype source[], unsigned chars) {
while ((chars > 1) && ((*dest = *source++) != 0)) {
--chars;
++dest;
}
if (chars)
*dest = 0;
}
//===========================================================================
template<class chartype>
@ -207,17 +226,6 @@ static int IStrCmpI (const chartype str1[], const chartype str2[], unsigned char
return 0;
}
//===========================================================================
template<class chartype>
static void IStrCopy (chartype * dest, const chartype source[], unsigned chars) {
while ((chars > 1) && ((*dest = *source++) != 0)) {
--chars;
++dest;
}
if (chars)
*dest = 0;
}
//===========================================================================
// returns StrLen(dest)
template<class chartype>
@ -284,15 +292,6 @@ static chartype * IStrStrI (chartype source[], const chartype match[]) {
return nil;
}
//===========================================================================
template<class chartype>
static unsigned IStrLen (const chartype str[]) {
unsigned chars = 0;
for (; *str++; ++chars)
NULL_STMT;
return chars;
}
//===========================================================================
template<class chartype>
static void IStrLower (chartype * dest, unsigned chars) {

1
Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
View File

@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "Pch.h"
#include "pnUtArray.h"
#include <wchar.h>
/*****************************************************************************
*