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

Namespaced custom swap templated function to prevent it from conflicted with Qt.

This commit is contained in:
mjbudd77 2021-11-18 21:55:31 -05:00
parent 7dfa1f8ae4
commit 62b377b97c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lua-engine.cpp
View File

@ -3436,11 +3436,14 @@ static void gui_prepare() {
#define LUA_PIXEL_G(PIX) (((PIX) >> 8) & 0xff) #define LUA_PIXEL_G(PIX) (((PIX) >> 8) & 0xff)
#define LUA_PIXEL_B(PIX) ((PIX) & 0xff) #define LUA_PIXEL_B(PIX) ((PIX) & 0xff)
//template <class T> static void swap(T &one, T &two) { namespace fceu
// T temp = one; {
// one = two; template <class T> static void swap(T &one, T &two) {
// two = temp; T temp = one;
//} one = two;
two = temp;
}
}
// write a pixel to buffer // write a pixel to buffer
static inline void blend32(uint32 *dstPixel, uint32 colour) static inline void blend32(uint32 *dstPixel, uint32 colour)
@ -3564,9 +3567,9 @@ static void gui_drawline_internal(int x1, int y1, int x2, int y2, bool lastPixel
static void gui_drawbox_internal(int x1, int y1, int x2, int y2, uint32 colour) { static void gui_drawbox_internal(int x1, int y1, int x2, int y2, uint32 colour) {
if (x1 > x2) if (x1 > x2)
std::swap<int>(x1, x2); fceu::swap<int>(x1, x2);
if (y1 > y2) if (y1 > y2)
std::swap<int>(y1, y2); fceu::swap<int>(y1, y2);
if (x1 < 0) if (x1 < 0)
x1 = -1; x1 = -1;
if (y1 < 0) if (y1 < 0)