Removed compatibility code for pre-VS2013 (MSVC12) compilers
This commit is contained in:
parent
fcd90d0533
commit
b5cf79424f
7 changed files with 0 additions and 54 deletions
|
@ -25,10 +25,6 @@
|
|||
#include "utils/make_enum.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER < 1600
|
||||
// SDL2 uses [dfi]vec.h which used to define EXPLICIT
|
||||
#undef EXPLICIT
|
||||
#endif
|
||||
#pragma warning(push)
|
||||
//silence "inherits via dominance" warnings
|
||||
#pragma warning(disable:4250)
|
||||
|
|
|
@ -57,17 +57,6 @@ static lg::log_domain log_wml("wml");
|
|||
static lg::log_domain log_event_handler("event_handler");
|
||||
#define DBG_EH LOG_STREAM(debug, log_event_handler)
|
||||
|
||||
// std::getline might be broken in Visual Studio so show a warning
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER < 1300
|
||||
#ifndef GETLINE_PATCHED
|
||||
#pragma message("warning: the std::getline implementation in your compiler might be broken.")
|
||||
#pragma message(" http://support.microsoft.com/default.aspx?scid=kb;EN-US;q240015")
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
// This file is in the game_events namespace.
|
||||
namespace game_events {
|
||||
|
||||
|
|
|
@ -23,15 +23,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER <= 1600
|
||||
/*
|
||||
This is needed because msvc up to 2010 fails to correcty forward declare this struct as a return value this case.
|
||||
And will create corrupt binaries without giving a warning / error.
|
||||
*/
|
||||
#include <SDL_video.h>
|
||||
#else
|
||||
struct SDL_Rect;
|
||||
#endif
|
||||
struct surface;
|
||||
class t_string;
|
||||
|
||||
|
|
|
@ -27,15 +27,7 @@
|
|||
|
||||
class game_data;
|
||||
class gamemap;
|
||||
#if defined(_MSC_VER) && _MSC_VER <= 1600
|
||||
/*
|
||||
This is needed because msvc up to 2010 fails to correcty forward declare this struct as a return value this case.
|
||||
And will create corrupt binaries without giving a warning / error.
|
||||
*/
|
||||
#include <SDL_video.h>
|
||||
#else
|
||||
struct SDL_Color;
|
||||
#endif
|
||||
|
||||
|
||||
namespace wb {
|
||||
|
|
|
@ -21,17 +21,8 @@
|
|||
#include <boost/noncopyable.hpp>
|
||||
|
||||
struct SDL_Thread;
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER <= 1600
|
||||
/*
|
||||
This is needed because msvc up to 2010 fails to correcty forward declare this struct as a return value this case.
|
||||
And will create corrupt binaries without giving a warning / error.
|
||||
*/
|
||||
#include <SDL_mutex.h>
|
||||
#else
|
||||
struct SDL_mutex;
|
||||
struct SDL_cond;
|
||||
#endif
|
||||
|
||||
// Threading primitives wrapper for SDL_Thread.
|
||||
//
|
||||
|
|
|
@ -26,15 +26,7 @@
|
|||
|
||||
class display;
|
||||
class gamemap;
|
||||
#if defined(_MSC_VER) && _MSC_VER <= 1600
|
||||
/*
|
||||
This is needed because msvc up to 2010 fails to correcty forward declare this struct as a return value this case.
|
||||
And will create corrupt binaries without giving a warning / error.
|
||||
*/
|
||||
#include <SDL_video.h>
|
||||
#else
|
||||
struct SDL_Color;
|
||||
#endif
|
||||
class team;
|
||||
class unit_animation_component;
|
||||
class unit_formula_manager;
|
||||
|
|
|
@ -34,12 +34,6 @@ class CVideo;
|
|||
* @param cond The condition to test, if false and exception is generated.
|
||||
* @param message The translatable message to show at the user.
|
||||
*/
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER < 1300
|
||||
#define __FUNCTION__ "(Unspecified)"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef __func__
|
||||
#ifdef __FUNCTION__
|
||||
#define __func__ __FUNCTION__
|
||||
|
|
Loading…
Add table
Reference in a new issue