ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SamplProf.cpp: Removed "using namespace std"

This commit is contained in:
archshift 2014-08-10 01:10:56 -07:00 committed by Gui Andrade
parent 396e42e17c
commit 466e6008ad
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/windows/SamplProf.cpp
View File

@ -20,8 +20,6 @@
#include <map> #include <map>
#include <algorithm> #include <algorithm>
using namespace std;
DWORD GetModuleFromPtr(IN void* ptr,OUT LPWSTR lpFilename,IN DWORD nSize) DWORD GetModuleFromPtr(IN void* ptr,OUT LPWSTR lpFilename,IN DWORD nSize)
{ {
MEMORY_BASIC_INFORMATION mbi; MEMORY_BASIC_INFORMATION mbi;
@ -108,9 +106,9 @@ struct Module
} }
}; };
typedef map<wxString,Module> MapType; typedef std::map<wxString,Module> MapType;
static vector<Module> ProfModules; static std::vector<Module> ProfModules;
static MapType ProfUnknownHash; static MapType ProfUnknownHash;
static HANDLE hEmuThread = NULL; static HANDLE hEmuThread = NULL;
@ -123,7 +121,7 @@ static volatile bool ProfRunning=false;
static bool _registeredName( const wxString& name ) static bool _registeredName( const wxString& name )
{ {
for( vector<Module>::const_iterator for( std::vector<Module>::const_iterator
iter = ProfModules.begin(), iter = ProfModules.begin(),
end = ProfModules.end(); iter<end; ++iter ) end = ProfModules.end(); iter<end; ++iter )
{ {
@ -169,7 +167,7 @@ void ProfilerRegisterSource(const char* Name, const void* function)
void ProfilerTerminateSource( const wxString& Name ) void ProfilerTerminateSource( const wxString& Name )
{ {
for( vector<Module>::const_iterator for( std::vector<Module>::const_iterator
iter = ProfModules.begin(), iter = ProfModules.begin(),
end = ProfModules.end(); iter<end; ++iter ) end = ProfModules.end(); iter<end; ++iter )
{ {
@ -211,7 +209,7 @@ static void MapUnknownSource( uint Eip )
DWORD sz=GetModuleFromPtr((void*)Eip,modulename,512); DWORD sz=GetModuleFromPtr((void*)Eip,modulename,512);
wxString modulenam( (sz==0) ? L"[Unknown]" : modulename ); wxString modulenam( (sz==0) ? L"[Unknown]" : modulename );
map<wxString,Module>::iterator iter = ProfUnknownHash.find(modulenam); std::map<wxString,Module>::iterator iter = ProfUnknownHash.find(modulenam);
if (iter!=ProfUnknownHash.end()) if (iter!=ProfUnknownHash.end())
{ {
iter->second.ticks++; iter->second.ticks++;
@ -254,7 +252,7 @@ int __stdcall ProfilerThread(void* nada)
} }
rT += wxsFormat( L"| Recs Total: %2.2f%% |", (float)(((double)subtotal*100.0) / (double)tick_count)); rT += wxsFormat( L"| Recs Total: %2.2f%% |", (float)(((double)subtotal*100.0) / (double)tick_count));
vector<MapType::mapped_type> lst; std::vector<MapType::mapped_type> lst;
for (MapType::iterator i=ProfUnknownHash.begin();i!=ProfUnknownHash.end();i++) for (MapType::iterator i=ProfUnknownHash.begin();i!=ProfUnknownHash.end();i++)
{ {
lst.push_back(i->second); lst.push_back(i->second);