From b275a5366d89f609429415fe86b3a98de33b2dec Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 17 Sep 2013 00:48:09 -0400 Subject: [PATCH 1/2] Prepare native for Visual Studio 2013. --- ui/viewgroup.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/viewgroup.cpp b/ui/viewgroup.cpp index a00621728b..bfa8489884 100644 --- a/ui/viewgroup.cpp +++ b/ui/viewgroup.cpp @@ -8,6 +8,8 @@ #include "ui/viewgroup.h" #include "gfx_es2/draw_buffer.h" +#include + namespace UI { const float ITEM_HEIGHT = 64.f; From 705239de2eeb4be5bbdf623afff04a4d745f5f2a Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 17 Sep 2013 01:43:47 -0400 Subject: [PATCH 2/2] Remove previously required define stuff. 2013 doesn't need this. --- base/basictypes.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/base/basictypes.h b/base/basictypes.h index d8de8c0713..58a858625e 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -3,17 +3,6 @@ #include #include // for byte swapping -#ifdef _WIN32 -// We need this to compile without hundreds of std::bind errors in Visual Studio 2012 -// since by default VARIADIC_MAX is something low like 3, 4, or 5. -// It's a good idea to include this file wherever std::bind is being used with more than 3, 4 or 5 args. -#if _MSC_VER >= 1700 -#undef _VARIADIC_MAX -#define _VARIADIC_MAX 10 -#endif - -#endif - #ifdef _WIN32 #pragma warning(disable:4244) #pragma warning(disable:4996)