dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15296) -Cleanup: remove redundant _MSC_VER >= 1400 checks, older versions aren't supported anymore. One check in stdafx.h is enough

Browse Source
This commit is contained in:
smatz
2009-01-30 17:54:48 +00:00
parent 6d22822faf
commit 1dcbba1c2d
5 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc/binaryheap.hpp
View File

@@ -5,12 +5,6 @@
#ifndef BINARYHEAP_HPP
#define BINARYHEAP_HPP
//void *operator new (size_t size, void *p) {return p;}
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
//void operator delete (void *p, void *p2) {}
#endif
/**
* Binary Heap as C++ template.
*

12
src/misc/strapi.hpp
View File

@@ -38,11 +38,11 @@ template <> /*static*/ inline size_t CStrApiBaseT<char>::StrLen(const char *s)
/** ::vsprintf wrapper specialization for char */
template <> /*static*/ inline int CStrApiBaseT<char>::SPrintFL(char *buf, size_t count, const char *fmt, va_list args)
{
#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(WINCE) // VC 8.0 and above
#if defined(_MSC_VER) && !defined(WINCE)
return ::vsnprintf_s(buf, count, count - 1, fmt, args);
#else /* ! VC 8.0 and above */
#else
return ::vsnprintf(buf, count, fmt, args);
#endif
#endif /* _MSC_VER && ! WINCE */
}
#if defined(HAS_WCHAR)
@@ -55,15 +55,15 @@ template <> /*static*/ inline size_t CStrApiBaseT<wchar_t>::StrLen(const wchar_t
/** ::vsprintf wrapper specialization for wchar_t */
template <> /*static*/ inline int CStrApiBaseT<wchar_t>::SPrintFL(wchar_t *buf, size_t count, const wchar_t *fmt, va_list args)
{
#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(WINCE) // VC 8.0 and above
#if defined(_MSC_VER) && !defined(WINCE)
return ::_vsnwprintf_s(buf, count, count - 1, fmt, args);
#else /* ! VC 8.0 and above */
#else
# if defined(_WIN32)
return ::_vsnwprintf(buf, count, fmt, args);
# else /* !_WIN32 */
return ::vswprintf(buf, count, fmt, args);
# endif /* !_WIN32 */
#endif
#endif /* _MSC_VER && ! WINCE */
}
#endif /* HAS_WCHAR */