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

Legacy cleanup, part 2 (#3659)

Browse Source 
* Legacy cleanup, part 2

There are still things that can be removed, those will be likely done in part three:
`The Return of the Cleanup` :)

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix windows build

Somehow there were some unfixed errors from enabled warnings?
I'm unsure if I've pulled repo in unstable state, or those were somehow
missed.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-08-30 22:40:02 +02:00
committed by GitHub
parent fa0f2a1007
commit 96a5f06ca3
116 changed files with 189 additions and 18706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CryCommon/ISystem.h
-54
View File
@@ -1095,57 +1095,6 @@ struct ISystem
using CrySystemNotificationBus = AZ::EBus<CrySystemNotifications>;
};
#if defined(USE_DISK_PROFILER)
struct DiskOperationInfo
{
DiskOperationInfo()
: m_nSeeksCount(0)
, m_nFileOpenCount(0)
, m_nFileReadCount(0)
, m_dOperationSize(0.)
, m_dOperationTime(0.) {}
int m_nSeeksCount;
int m_nFileOpenCount;
int m_nFileReadCount;
double m_dOperationTime;
double m_dOperationSize;
DiskOperationInfo& operator -= (const DiskOperationInfo& rv)
{
m_nSeeksCount -= rv.m_nSeeksCount;
m_nFileOpenCount -= rv.m_nFileOpenCount;
m_nFileReadCount -= rv.m_nFileReadCount;
m_dOperationSize -= rv.m_dOperationSize;
m_dOperationTime -= rv.m_dOperationTime;
return *this;
}
DiskOperationInfo& operator += (const DiskOperationInfo& rv)
{
m_nSeeksCount += rv.m_nSeeksCount;
m_nFileOpenCount += rv.m_nFileOpenCount;
m_nFileReadCount += rv.m_nFileReadCount;
m_dOperationSize += rv.m_dOperationSize;
m_dOperationTime += rv.m_dOperationTime;
return *this;
}
DiskOperationInfo operator - (const DiskOperationInfo& rv)
{
DiskOperationInfo res(*this);
return res -= rv;
}
DiskOperationInfo operator + (const DiskOperationInfo& rv)
{
DiskOperationInfo res(*this);
return res += rv;
}
};
#endif
//////////////////////////////////////////////////////////////////////////
// CrySystem DLL Exports.
//////////////////////////////////////////////////////////////////////////
@@ -1365,9 +1314,6 @@ namespace Detail
bool IsConstCVar() const { return true; }
void SetOnChangeCallback(ConsoleVarFunc pChangeFunc) { (void)pChangeFunc; }
uint64 AddOnChangeFunctor(const SFunctor& pChangeFunctor) { (void)pChangeFunctor; return 0; }
uint64 GetNumberOfOnChangeFunctors() const { return 0; }
const SFunctor& GetOnChangeFunctor([[maybe_unused]] uint64 nFunctorIndex) const { InvalidAccess(); SFunctor* pNull = nullptr; return *pNull; }
bool RemoveOnChangeFunctor([[maybe_unused]] const uint64 nElement) { return true; }
ConsoleVarFunc GetOnChangeCallback() const { InvalidAccess(); return NULL; }
void GetMemoryUsage([[maybe_unused]] class ICrySizer* pSizer) const {}
int GetRealIVal() const { return GetIVal(); }