Browse Source

Some fixes for Clang

Michael Hansen 10 years ago
parent
commit
085c00706c
  1. 1
      Sources/Plasma/CoreLib/hsTemplates.h
  2. 8
      Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
  3. 2
      Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp

1
Sources/Plasma/CoreLib/hsTemplates.h

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

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

@ -740,25 +740,25 @@ public:
//===========================================================================
template<class T, class 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>
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>
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>
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

@ -721,7 +721,7 @@ bool plSecureStream::GetSecureEncryptionKey(const plFileName& filename, uint32_t
}
// 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);
memcpy(key, plSecureStream::kDefaultKey, memSize);

Loading…
Cancel
Save