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

Rename EMotionFX class members to follow the m_ naming convention

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-08-09 14:09:45 -07:00
parent 9afbd07a88
commit 1837d05169
649 changed files with 20161 additions and 21889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/MCore/Source/StringIdPool.cpp
+12 -12
View File
@@ -29,13 +29,13 @@ namespace MCore
{
Lock();
for (AZStd::basic_string<char>*& string : mStrings)
for (AZStd::basic_string<char>*& string : m_strings)
{
delete string;
}
mStrings.clear();
m_strings.clear();
mStringToIndex.clear();
m_stringToIndex.clear();
Unlock();
}
@@ -43,7 +43,7 @@ namespace MCore
AZ::u32 StringIdPool::GenerateIdForStringWithoutLock(const AZStd::string& objectName)
{
// Try to insert it, if we hit a collision, we have the element.
auto iterator = mStringToIndex.emplace(objectName, aznumeric_caster(mStrings.size()));
auto iterator = m_stringToIndex.emplace(objectName, aznumeric_caster(m_strings.size()));
if (!iterator.second)
{
// could not insert, we have the element
@@ -52,7 +52,7 @@ namespace MCore
// Create the new string object and push it to the string list.
AZStd::string* newString = new AZStd::string(objectName);
mStrings.push_back(newString);
m_strings.push_back(newString);
// The string was already added to the hashmap
return iterator.first->second;
@@ -72,7 +72,7 @@ namespace MCore
{
Lock();
MCORE_ASSERT(id != InvalidIndex32);
const AZStd::string* stringAddress = mStrings[id];
const AZStd::string* stringAddress = m_strings[id];
Unlock();
return *stringAddress;
}
@@ -81,7 +81,7 @@ namespace MCore
void StringIdPool::Reserve(size_t numStrings)
{
Lock();
mStrings.reserve(numStrings);
m_strings.reserve(numStrings);
Unlock();
}
@@ -89,27 +89,27 @@ namespace MCore
// Wait with execution until we can set the lock.
void StringIdPool::Lock()
{
mMutex.Lock();
m_mutex.Lock();
}
// Release the lock again.
void StringIdPool::Unlock()
{
mMutex.Unlock();
m_mutex.Unlock();
}
void StringIdPool::Log(bool includeEntries)
{
AZ_Printf("EMotionFX", "StringIdPool: NumEntries=%d\n", mStrings.size());
AZ_Printf("EMotionFX", "StringIdPool: NumEntries=%d\n", m_strings.size());
if (includeEntries)
{
const size_t numStrings = mStrings.size();
const size_t numStrings = m_strings.size();
for (size_t i = 0; i < numStrings; ++i)
{
AZ_Printf("EMotionFX", " #%d: String='%s', Id=%d\n", i, mStrings[i]->c_str(), GenerateIdForString(mStrings[i]->c_str()));
AZ_Printf("EMotionFX", " #%d: String='%s', Id=%d\n", i, m_strings[i]->c_str(), GenerateIdForString(m_strings[i]->c_str()));
}
}
}