games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Cleanup undef for min / max. NOMINMAX is already in Global.h

Browse Source
This commit is contained in:
Arseniy Shestakov 2018-02-10 22:15:27 +03:00
parent ccc1639ab9
commit 8bbe747e8e
6 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/CPlayerInterface.h
View File

@ -19,13 +19,6 @@
#define sprintf_s snprintf #define sprintf_s snprintf
#endif #endif
#ifdef max
#undef max
#endif
#ifdef min
#undef min
#endif
class CButton; class CButton;
class CToggleGroup; class CToggleGroup;
struct TryMoveHero; struct TryMoveHero;

6
client/Graphics.cpp
View File

@ -33,12 +33,6 @@
#include "../lib/mapObjects/CObjectHandler.h" #include "../lib/mapObjects/CObjectHandler.h"
using namespace CSDL_Ext; using namespace CSDL_Ext;
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
Graphics * graphics = nullptr; Graphics * graphics = nullptr;

3
client/windows/GUIClasses.cpp
View File

@ -65,9 +65,6 @@ using namespace CSDL_Ext;
std::list<CFocusable*> CFocusable::focusables; std::list<CFocusable*> CFocusable::focusables;
CFocusable * CFocusable::inputWithFocus; CFocusable * CFocusable::inputWithFocus;
#undef min
#undef max
CRecruitmentWindow::CCreatureCard::CCreatureCard(CRecruitmentWindow *window, const CCreature *crea, int totalAmount): CRecruitmentWindow::CCreatureCard::CCreatureCard(CRecruitmentWindow *window, const CCreature *crea, int totalAmount):
CIntObject(LCLICK | RCLICK), CIntObject(LCLICK | RCLICK),
parent(window), parent(window),

7
lib/CGameState.cpp
View File

@ -37,13 +37,6 @@
#include "serializer/CMemorySerializer.h" #include "serializer/CMemorySerializer.h"
#include "VCMIDirs.h" #include "VCMIDirs.h"
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
boost::shared_mutex CGameState::mutex; boost::shared_mutex CGameState::mutex;
template <typename T> class CApplyOnGS; template <typename T> class CApplyOnGS;

3
lib/NetPacksLib.cpp
View File

@ -28,9 +28,6 @@
#include "StartInfo.h" #include "StartInfo.h"
#include "CPlayerState.h" #include "CPlayerState.h"
#undef min
#undef max
DLL_LINKAGE void SetResources::applyGs(CGameState *gs) DLL_LINKAGE void SetResources::applyGs(CGameState *gs)
{ {

6
server/CGameHandler.cpp
View File

@ -49,12 +49,6 @@
#include <boost/thread/xtime.hpp> #include <boost/thread/xtime.hpp>
#endif #endif
extern std::atomic<bool> serverShuttingDown; extern std::atomic<bool> serverShuttingDown;
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
#define COMPLAIN_RET_IF(cond, txt) do {if (cond){complain(txt); return;}} while(0) #define COMPLAIN_RET_IF(cond, txt) do {if (cond){complain(txt); return;}} while(0)
#define COMPLAIN_RET_FALSE_IF(cond, txt) do {if (cond){complain(txt); return false;}} while(0) #define COMPLAIN_RET_FALSE_IF(cond, txt) do {if (cond){complain(txt); return false;}} while(0)