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

onepad: Remove use of "using namespace std" 

"using namespace std" was causing ambiguity issues and compile errors on
FreeBSD. Remove it.
This commit is contained in:
Jonathan Li 2017-05-23 01:02:04 +00:00
parent 802f1029e9
commit e8f35f0bab
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/onepad/controller.cpp
View File

@ -31,7 +31,7 @@ __forceinline int get_keyboard_key(int pad, int keysym)
{ {
// You must use find instead of [] // You must use find instead of []
// [] will create an element if the key does not exist and return 0 // [] will create an element if the key does not exist and return 0
map<u32, u32>::iterator it = g_conf.keysym_map[pad].find(keysym); std::map<u32, u32>::iterator it = g_conf.keysym_map[pad].find(keysym);
if (it != g_conf.keysym_map[pad].end()) if (it != g_conf.keysym_map[pad].end())
return it->second; return it->second;
else else

2
plugins/onepad/controller.h
View File

@ -50,7 +50,7 @@ public:
}; };
u32 log; u32 log;
map<u32, u32> keysym_map[GAMEPAD_NUMBER]; std::map<u32, u32> keysym_map[GAMEPAD_NUMBER];
std::array<size_t, GAMEPAD_NUMBER> unique_id; std::array<size_t, GAMEPAD_NUMBER> unique_id;
std::vector<std::string> sdl2_mapping; std::vector<std::string> sdl2_mapping;

1
plugins/onepad/onepad.h
View File

@ -46,7 +46,6 @@
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <queue> #include <queue>
using namespace std;
#define PADdefs #define PADdefs
#include "PS2Edefs.h" #include "PS2Edefs.h"