Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove some checks for usupported VS versions (<2013).

Browse Source 
This was SVN commit r16225.
This commit is contained in:
leper 2015-01-24 20:37:16 +00:00
parent fc902df07c
commit 0261d12727
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/code_annotation.h
View File

@ -295,7 +295,7 @@ switch(x % 2)
#if GCC_VERSION
# define RESTRICT __restrict__
// .. VC8 provides __restrict
#elif MSC_VERSION >= 1400
#elif MSC_VERSION
# define RESTRICT __restrict
// .. ICC supports the keyword 'restrict' when run with the /Qrestrict option,
// but it always also supports __restrict__ or __restrict to be compatible

4
source/lib/debug_stl.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* Copyright (c) 2015 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -549,7 +549,7 @@ template<class T> bool get_container_info(const T& t, size_t size, size_t el_siz
Status debug_stl_get_container_info(const wchar_t* type_name, const u8* p, size_t size,
size_t el_size, size_t* el_count, DebugStlIterator* el_iterator, void* it_mem)
{
#if MSC_VERSION >= 1400
#if MSC_VERSION
UNUSED2(type_name);
UNUSED2(p);
UNUSED2(size);

2
source/lib/pch/pch_boost.h
View File

@ -3,7 +3,7 @@
#include "lib/external_libraries/suppress_boost_warnings.h"
#if MSC_VERSION >= 1600
#if MSC_VERSION
# define BOOST_HAS_STDINT_H
#endif

11
source/lib/pch/pch_warnings.h
View File

@ -17,13 +17,10 @@
# pragma warning(disable:4718) // recursive call has no side effects, deleting
# pragma warning(disable:4786) // identifier truncated to 255 chars
# pragma warning(disable:4996) // function is deprecated
// .. VS2005 code analysis (very frequent ones)
# if MSC_VERSION >= 1400
# pragma warning(disable:6011) // dereferencing NULL pointer
# pragma warning(disable:6246) // local declaration hides declaration of the same name in outer scope
# pragma warning(disable:6326) // potential comparison of a constant with another constant
# pragma warning(disable:6334) // sizeof operator applied to an expression with an operator might yield unexpected results
# endif
# pragma warning(disable:6011) // dereferencing NULL pointer
# pragma warning(disable:6246) // local declaration hides declaration of the same name in outer scope
# pragma warning(disable:6326) // potential comparison of a constant with another constant
# pragma warning(disable:6334) // sizeof operator applied to an expression with an operator might yield unexpected results
// .. Intel-specific
# if ICC_VERSION
# pragma warning(disable:383) // value copied to temporary, reference to temporary used

4
source/lib/secure_crt.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games
/* Copyright (c) 2015 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -37,7 +37,7 @@ namespace ERR
}
// if the platform lacks a secure CRT implementation, we'll provide one.
#if MSC_VERSION >= 1400
#if MSC_VERSION
# define EMULATE_SECURE_CRT 0
#else
# define EMULATE_SECURE_CRT 1