OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Some fixes for Clang

Browse Source
This commit is contained in:
Michael Hansen
2014-08-09 12:44:57 -07:00
parent 094b0fe557
commit 085c00706c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/CoreLib/hsTemplates.h
View File

@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsRefCnt.h" #include "hsRefCnt.h"
#include <cstdarg> #include <cstdarg>
#include <algorithm>
#ifdef HS_DEBUGGING #ifdef HS_DEBUGGING

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

@ -740,25 +740,25 @@ public:
//=========================================================================== //===========================================================================
template<class T, class C> template<class T, class C>
TArray<T,C>::TArray () : TFArray<T,C>() { TArray<T,C>::TArray () : TFArray<T,C>() {
m_chunkSize = std::max(1u, 256 / sizeof(T)); m_chunkSize = std::max(size_t(1), 256 / sizeof(T));
} }
//=========================================================================== //===========================================================================
template<class T, class C> template<class T, class C>
TArray<T,C>::TArray (const char file[], int line) : TFArray<T,C>(file, line) { TArray<T,C>::TArray (const char file[], int line) : TFArray<T,C>(file, line) {
m_chunkSize = std::max(1u, 256 / sizeof(T)); m_chunkSize = std::max(size_t(1), 256 / sizeof(T));
} }
//=========================================================================== //===========================================================================
template<class T, class C> template<class T, class C>
TArray<T,C>::TArray (unsigned count) : TFArray<T,C>(count) { TArray<T,C>::TArray (unsigned count) : TFArray<T,C>(count) {
m_chunkSize = std::max(1u, 256 / sizeof(T)); m_chunkSize = std::max(size_t(1), 256 / sizeof(T));
} }
//=========================================================================== //===========================================================================
template<class T, class C> template<class T, class C>
TArray<T,C>::TArray (const T * source, unsigned count) : TFArray<T,C>(source, count) { TArray<T,C>::TArray (const T * source, unsigned count) : TFArray<T,C>(source, count) {
m_chunkSize = std::max(1u, 256 / sizeof(T)); m_chunkSize = std::max(size_t(1), 256 / sizeof(T));
} }
//=========================================================================== //===========================================================================

2
Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp
View File

@ -721,7 +721,7 @@ bool plSecureStream::GetSecureEncryptionKey(const plFileName& filename, uint32_t
} }
// file doesn't exist, use default key // file doesn't exist, use default key
unsigned memSize = std::min(length, arrsize(plSecureStream::kDefaultKey)); unsigned memSize = std::min(size_t(length), arrsize(plSecureStream::kDefaultKey));
memSize *= sizeof(uint32_t); memSize *= sizeof(uint32_t);
memcpy(key, plSecureStream::kDefaultKey, memSize); memcpy(key, plSecureStream::kDefaultKey, memSize);