From df7966053102ed6e509992554ab7544c56454f26 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Fri, 30 Jan 2009 17:54:48 +0000
Subject: (svn r15296) -Cleanup: remove redundant _MSC_VER >= 1400 checks,
 older versions aren't supported anymore. One check in stdafx.h is enough

---
 src/misc/binaryheap.hpp |  6 ------
 src/misc/strapi.hpp     | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/misc')

diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.hpp
index ed5a44b71..2206ccd03 100644
--- a/src/misc/binaryheap.hpp
+++ b/src/misc/binaryheap.hpp
@@ -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.
  *
diff --git a/src/misc/strapi.hpp b/src/misc/strapi.hpp
index 53e0dd9e5..eec7c6437 100644
--- a/src/misc/strapi.hpp
+++ b/src/misc/strapi.hpp
@@ -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 */
 
-- 
cgit v1.2.3-54-g00ecf