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

gsdx: Prefix std:: to list 

Also use auto when appropriate
This commit is contained in:
Jonathan Li 2017-05-26 17:07:00 +01:00 committed by Gregory Hainaut
parent 5415b7ad5b
commit 2ff67f3741
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GS.cpp
View File

@ -1429,7 +1429,7 @@ EXPORT_C GSReplay(char* lpszCmdLine, int renderer)
struct Packet {uint8 type, param; uint32 size, addr; std::vector<uint8> buff;}; struct Packet {uint8 type, param; uint32 size, addr; std::vector<uint8> buff;};
list<Packet*> packets; std::list<Packet*> packets;
std::vector<uint8> buff; std::vector<uint8> buff;
uint8 regs[0x2000]; uint8 regs[0x2000];

2
plugins/GSdx/GSCaptureDlg.h
View File

@ -35,7 +35,7 @@ class GSCaptureDlg : public GSDialog
_bstr_t DisplayName; _bstr_t DisplayName;
}; };
list<Codec> m_codecs; std::list<Codec> m_codecs;
int GetSelCodec(Codec& c); int GetSelCodec(Codec& c);

2
plugins/GSdx/GSRendererCL.cpp
View File

@ -1887,7 +1887,7 @@ GSRendererCL::CL::CL()
ocldev = "Intel(R) Corporation Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz OpenCL C 1.2 CPU"; ocldev = "Intel(R) Corporation Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz OpenCL C 1.2 CPU";
#endif #endif
list<OCLDeviceDesc> dl; std::list<OCLDeviceDesc> dl;
GSUtil::GetDeviceDescs(dl); GSUtil::GetDeviceDescs(dl);

16
plugins/GSdx/GSRendererHW.h
View File

@ -96,18 +96,18 @@ private:
template<class T> class FunctionMap : public GSFunctionMap<uint32, T> template<class T> class FunctionMap : public GSFunctionMap<uint32, T>
{ {
list<HackEntry<T> >& m_tbl; std::list<HackEntry<T> >& m_tbl;
T GetDefaultFunction(uint32 key) T GetDefaultFunction(uint32 key)
{ {
CRC::Title title = (CRC::Title)(key & 0xffffff); CRC::Title title = (CRC::Title)(key & 0xffffff);
CRC::Region region = (CRC::Region)(key >> 24); CRC::Region region = (CRC::Region)(key >> 24);
for(typename list<HackEntry<T> >::iterator i = m_tbl.begin(); i != m_tbl.end(); i++) for(const auto &entry : m_tbl)
{ {
if(i->title == title && (i->region == CRC::RegionCount || i->region == region)) if(entry.title == title && (entry.region == CRC::RegionCount || entry.region == region))
{ {
return i->func; return entry.func;
} }
} }
@ -115,12 +115,12 @@ private:
} }
public: public:
FunctionMap(list<HackEntry<T> >& tbl) : m_tbl(tbl) {} FunctionMap(std::list<HackEntry<T> >& tbl) : m_tbl(tbl) {}
}; };
list<HackEntry<OI_Ptr> > m_oi_list; std::list<HackEntry<OI_Ptr> > m_oi_list;
list<HackEntry<OO_Ptr> > m_oo_list; std::list<HackEntry<OO_Ptr> > m_oo_list;
list<HackEntry<CU_Ptr> > m_cu_list; std::list<HackEntry<CU_Ptr> > m_cu_list;
FunctionMap<OI_Ptr> m_oi_map; FunctionMap<OI_Ptr> m_oi_map;
FunctionMap<OO_Ptr> m_oo_map; FunctionMap<OO_Ptr> m_oo_map;

2
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -34,7 +34,7 @@ GSSettingsDlg::GSSettingsDlg()
{ {
#ifdef ENABLE_OPENCL #ifdef ENABLE_OPENCL
list<OCLDeviceDesc> ocldevs; std::list<OCLDeviceDesc> ocldevs;
GSUtil::GetDeviceDescs(ocldevs); GSUtil::GetDeviceDescs(ocldevs);

4
plugins/GSdx/GSTextureCache.cpp
View File

@ -976,9 +976,9 @@ void GSTextureCache::InvalidateLocalMem(GSOffset* off, const GSVector4i& r)
//GSTextureCache::Target* rt2 = NULL; //GSTextureCache::Target* rt2 = NULL;
//int ymin = INT_MAX; //int ymin = INT_MAX;
//for(list<Target*>::iterator i = m_dst[RenderTarget].begin(); i != m_dst[RenderTarget].end(); ) //for(auto i = m_dst[RenderTarget].begin(); i != m_dst[RenderTarget].end(); )
//{ //{
// list<Target*>::iterator j = i++; // auto j = i++;
// Target* t = *j; // Target* t = *j;

2
plugins/GSdx/GSUtil.cpp
View File

@ -255,7 +255,7 @@ CRCHackLevel GSUtil::GetRecommendedCRCHackLevel(GSRendererType type)
#define OCL_PROGRAM_VERSION 3 #define OCL_PROGRAM_VERSION 3
#ifdef ENABLE_OPENCL #ifdef ENABLE_OPENCL
void GSUtil::GetDeviceDescs(list<OCLDeviceDesc>& dl) void GSUtil::GetDeviceDescs(std::list<OCLDeviceDesc>& dl)
{ {
dl.clear(); dl.clear();

2
plugins/GSdx/GSUtil.h
View File

@ -55,7 +55,7 @@ public:
static CRCHackLevel GetRecommendedCRCHackLevel(GSRendererType type); static CRCHackLevel GetRecommendedCRCHackLevel(GSRendererType type);
#ifdef ENABLE_OPENCL #ifdef ENABLE_OPENCL
static void GetDeviceDescs(list<OCLDeviceDesc>& dl); static void GetDeviceDescs(std::list<OCLDeviceDesc>& dl);
static std::string GetDeviceUniqueName(cl::Device& device); static std::string GetDeviceUniqueName(cl::Device& device);
#endif #endif

2
plugins/GSdx/PSX/GPUSettingsDlg.h
View File

@ -26,7 +26,7 @@
class GPUSettingsDlg : public GSDialog class GPUSettingsDlg : public GSDialog
{ {
list<D3DDISPLAYMODE> m_modes; std::list<D3DDISPLAYMODE> m_modes;
void UpdateControls(); void UpdateControls();