birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/AddressSanitizer

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-19 12:25:41 -07:00
parent 68b04fa6c1 8ae384e93f
commit 61f7fe5dc5
429 changed files with 1447 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CryCommon/CryHeaders.h
+1 -1
View File
@@ -395,7 +395,7 @@ struct MotionParams905
MotionParams905()
{
m_nAssetFlags = 0;
m_nCompression = -1;
m_nCompression = std::numeric_limits<uint32>::max();
m_nTicksPerFrame = 0;
m_fSecsPerTick = 0;
m_nStart = 0;
Code/Legacy/CryCommon/ISerialize.h
+1 -1
View File
@@ -31,7 +31,7 @@ class InterpolatedValue_tpl;
// Unfortunately this needs to be here - should be in CryNetwork somewhere.
struct SNetObjectID
{
static const uint16 InvalidId = ~uint16(0);
static const uint16 InvalidId = std::numeric_limits<uint16>::max();
SNetObjectID()
: id(InvalidId)
Code/Legacy/CryCommon/ISplines.h
+1 -1
View File
@@ -466,7 +466,7 @@ namespace spline
ILINE void flag_clr(int flag) { m_flags &= ~flag; };
ILINE int flag(int flag) { return m_flags & flag; };
ILINE void ORT(int ort) { m_ORT = ort; };
ILINE void ORT(int ort) { m_ORT = static_cast<uint8>(ort); };
ILINE int ORT() const { return m_ORT; };
ILINE int isORT(int o) const { return (m_ORT == o); };
Code/Legacy/CryCommon/PNoise3.h
+2 -2
View File
@@ -205,7 +205,7 @@ public:
// Initialize the permutation table
for(i = 0; i < NOISE_TABLE_SIZE; i++)
m_p[i] = i;
m_p[i] = static_cast<unsigned char>(i);
for(i = 0; i < NOISE_TABLE_SIZE; i++)
{
@@ -213,7 +213,7 @@ public:
nSwap = m_p[i];
m_p[i] = m_p[j];
m_p[j] = nSwap;
m_p[j] = static_cast<unsigned char>(nSwap);
}
// Generate the gradient lookup tables
Code/Legacy/CryCommon/Vertex.h
+1 -1
View File
@@ -1037,7 +1037,7 @@ namespace AZ
}
AZ_Assert(stride < (0x1 << (sizeof(m_stride) * 8)), "Vertex stride is larger than the maximum supported, update the type for m_stride in Vertex.h");
m_stride = stride;
m_stride = static_cast<uint8>(stride);
}
Code/Legacy/CrySystem/CmdLine.cpp
-1
View File
@@ -192,7 +192,6 @@ AZStd::string CCmdLine::Next(char*& src)
return AZStd::string(org, src);
}
ch = *src++;
}
return AZStd::string();
Code/Legacy/CrySystem/LocalizedStringManager.cpp
+1 -1
View File
@@ -473,7 +473,7 @@ void CLocalizedStringsManager::ParseFirstLine(IXmlTableReader* pXmlTableReader,
const char* pFind = strstr(sCellContent.c_str(), sLocalizedColumnNames[i]);
if (pFind != 0)
{
nCellIndexToType[nCellIndex] = i;
nCellIndexToType[nCellIndex] = static_cast<char>(i);
// find SoundMood
if (i == ELOCALIZED_COLUMN_SOUNDMOOD)
Code/Legacy/CrySystem/Log.cpp
+1 -1
View File
@@ -1228,7 +1228,7 @@ void CLog::CreateBackupFile() const
while (!fileSystem->Eof(inFileHandle))
{
uint8 c = AZ::IO::GetC(inFileHandle);
uint8 c = static_cast<uint8>(AZ::IO::GetC(inFileHandle));
if (c == '\"')
{
Code/Legacy/CrySystem/ViewSystem/ViewSystem.cpp
+1 -1
View File
@@ -334,7 +334,7 @@ void CViewSystem::SetActiveView(IView* pView)
}
else
{
m_activeViewId = ~0;
m_activeViewId = ~0u;
}
m_bActiveViewFromSequence = false;
Code/Legacy/CrySystem/XConsole.cpp
+4 -3
View File
@@ -2464,8 +2464,9 @@ void CXConsole::DisplayVarValue(ICVar* pVar)
sValue += " (";
if (nonAlphaBits != 0)
{
char nonAlphaChars[3]; // 1..63 + '\0'
sValue += azitoa(nonAlphaBits, nonAlphaChars, AZ_ARRAY_SIZE(nonAlphaChars), 10);
char nonAlphaChars[3] = { 0 }; // 1..63 + '\0'
azitoa(nonAlphaBits, nonAlphaChars, AZ_ARRAY_SIZE(nonAlphaChars), 10);
sValue += nonAlphaChars;
sValue += ", ";
}
sValue += alphaChars;
@@ -2856,7 +2857,7 @@ void CXConsole::Paste()
Utf8::Unchecked::octet_iterator end(data.end());
for (Utf8::Unchecked::octet_iterator it(data.begin()); it != end; ++it)
{
const wchar_t cp = *it;
const wchar_t cp = static_cast<wchar_t>(*it);
if (cp != '\r')
{
// Convert UCS code-point into UTF-8 string
Code/Legacy/CrySystem/XML/SerializeXMLReader.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ bool CSerializeXMLReaderImpl::Value(const char* name, int8& value)
}
else
{
value = temp;
value = static_cast<int8>(temp);
}
return bResult;
}
Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp
+1 -1
View File
@@ -320,7 +320,7 @@ bool CBinaryXmlNode::getAttr(const char* key, ColorB& value) const
// If we only found 3 values, a should be unchanged, and still be 255
if (r < 256 && g < 256 && b < 256 && a < 256)
{
value = ColorB(r, g, b, a);
value = ColorB(static_cast<uint8>(r), static_cast<uint8>(g), static_cast<uint8>(b), static_cast<uint8>(a));
return true;
}
}
Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
+2 -2
View File
@@ -244,7 +244,7 @@ bool XMLBinary::CXMLBinaryWriter::CompileTablesForNode(XmlNodeRef node, int nPar
nd.nContentStringOffset = nContentStringOffset;
nd.nParentIndex = nParentIndex;
nd.nFirstAttributeIndex = nFirstAttributeIndex;
nd.nAttributeCount = nAttributeCount;
nd.nAttributeCount = static_cast<uint16>(nAttributeCount);
m_nodes.push_back(nd);
}
@@ -271,7 +271,7 @@ bool XMLBinary::CXMLBinaryWriter::CompileTablesForNode(XmlNodeRef node, int nPar
}
}
m_nodes[nIndex].nChildCount = nChildCount;
m_nodes[nIndex].nChildCount = static_cast<uint16>(nChildCount);
return true;
}
Code/Legacy/CrySystem/XML/xml.cpp
+1 -1
View File
@@ -641,7 +641,7 @@ bool CXmlNode::getAttr(const char* key, ColorB& value) const
// If we only found 3 values, a should be unchanged, and still be 255
if (r < 256 && g < 256 && b < 256 && a < 256)
{
value = ColorB(r, g, b, a);
value = ColorB(static_cast<uint8>(r), static_cast<uint8>(g), static_cast<uint8>(b), static_cast<uint8>(a));
return true;
}
}