diff --git a/r5dev/tier0/cputopology.cpp b/r5dev/tier0/cputopology.cpp index 8769e3cd..cfb57c9b 100644 --- a/r5dev/tier0/cputopology.cpp +++ b/r5dev/tier0/cputopology.cpp @@ -46,7 +46,7 @@ public: //----------------------------------------------------------------------------- // DefaultImpl::IsDefaultImpl //----------------------------------------------------------------------------- - /*virtual*/ BOOL IsDefaultImpl() const + virtual BOOL IsDefaultImpl() const { return TRUE; } @@ -54,7 +54,7 @@ public: //----------------------------------------------------------------------------- // DefaultImpl::NumberOfProcessCores //----------------------------------------------------------------------------- - /*virtual*/ DWORD NumberOfProcessCores() const + virtual DWORD NumberOfProcessCores() const { return 1; } @@ -62,7 +62,7 @@ public: //----------------------------------------------------------------------------- // DefaultImpl::IsNumberOfSystemCores //----------------------------------------------------------------------------- - /*virtual*/ DWORD NumberOfSystemCores() const + virtual DWORD NumberOfSystemCores() const { return 1; } @@ -70,7 +70,7 @@ public: //----------------------------------------------------------------------------- // DefaultImpl::CoreAffinityMask //----------------------------------------------------------------------------- - /*virtual*/ DWORD_PTR CoreAffinityMask( DWORD coreIdx ) const + virtual DWORD_PTR CoreAffinityMask( DWORD coreIdx ) const { DWORD_PTR coreAffinity = 0; if( 1 == coreIdx ) @@ -116,7 +116,7 @@ public: //----------------------------------------------------------------------------- // Name: GlpiImpl::~GlpiImpl //----------------------------------------------------------------------------- - /*virtual*/ ~GlpiImpl() + virtual ~GlpiImpl() { free( m_pSlpi ); m_pSlpi = 0; @@ -126,7 +126,7 @@ public: //----------------------------------------------------------------------------- // Name: GlpiImpl::IsDefaultImpl //----------------------------------------------------------------------------- - /*virtual*/ BOOL IsDefaultImpl() const + virtual BOOL IsDefaultImpl() const { return FALSE; } @@ -136,7 +136,7 @@ public: // Desc: Gets the total number of physical processor cores available to the // current process. //----------------------------------------------------------------------------- - /*virtual*/ DWORD NumberOfProcessCores() const + virtual DWORD NumberOfProcessCores() const { DWORD_PTR dwProcessAffinity, dwSystemAffinity; GetProcessAffinityMask( GetCurrentProcess(), &dwProcessAffinity, &dwSystemAffinity ); @@ -158,7 +158,7 @@ public: // Desc: Gets the total number of physical processor cores enabled on the // system. //----------------------------------------------------------------------------- - /*virtual*/ DWORD NumberOfSystemCores() const + virtual DWORD NumberOfSystemCores() const { DWORD nCores = 0; for( DWORD i = 0; i < m_nItems; ++i ) @@ -174,7 +174,7 @@ public: // Desc: Gets an affinity mask that corresponds to the requested processor // core. //----------------------------------------------------------------------------- - /*virtual*/ DWORD_PTR CoreAffinityMask( DWORD coreIdx ) const + virtual DWORD_PTR CoreAffinityMask( DWORD coreIdx ) const { DWORD_PTR dwProcessAffinity, dwSystemAffinity; GetProcessAffinityMask( GetCurrentProcess(), &dwProcessAffinity, &dwSystemAffinity ); @@ -728,7 +728,7 @@ public: //----------------------------------------------------------------------------- // Name: CpuidImpl::IsDefaultImpl //----------------------------------------------------------------------------- - /*virtual*/ BOOL IsDefaultImpl() const + virtual BOOL IsDefaultImpl() const { return FALSE; } @@ -739,7 +739,7 @@ public: // The total accounts for cores that may have been masked out by process // affinity. //----------------------------------------------------------------------------- - /*virtual*/ DWORD NumberOfProcessCores() const + virtual DWORD NumberOfProcessCores() const { DWORD_PTR dwProcessAffinity, dwSystemAffinity; GetProcessAffinityMask( GetCurrentProcess(), &dwProcessAffinity, &dwSystemAffinity ); @@ -761,7 +761,7 @@ public: // Name: CpuidImpl::NumberOfSystemCores // Desc: Gets the number of processor cores on the system. //----------------------------------------------------------------------------- - /*virtual*/ DWORD NumberOfSystemCores() const + virtual DWORD NumberOfSystemCores() const { BYTE pkgCoreIds[MaxLogicalProcessors] = { 0 }; DWORD nPkgCoreIds = 0; @@ -778,7 +778,7 @@ public: // coreIdx must be less than the total number of processor cores // recognized by the operating system (NumberOfSystemCores()). //----------------------------------------------------------------------------- - /*virtual*/ DWORD_PTR CoreAffinityMask( DWORD coreIdx ) const + virtual DWORD_PTR CoreAffinityMask( DWORD coreIdx ) const { BYTE pkgCoreIds[MaxLogicalProcessors] = { 0 }; DWORD nPkgCoreIds = 0;