diff --git a/src/lib/common/stdistream.h b/src/lib/common/stdistream.h index 5cded0249..f983cd1a5 100644 --- a/src/lib/common/stdistream.h +++ b/src/lib/common/stdistream.h @@ -26,31 +26,3 @@ #endif #include "stdpost.h" - -#if defined(_MSC_VER) && _MSC_VER <= 1200 -// VC++6 istream has no overloads for __int* types, .NET does -inline std::istream &operator>>(std::istream &s, SInt8 &i) -{ - return s >> (signed char &)i; -} -inline std::istream &operator>>(std::istream &s, SInt16 &i) -{ - return s >> (short &)i; -} -inline std::istream &operator>>(std::istream &s, SInt32 &i) -{ - return s >> (int &)i; -} -inline std::istream &operator>>(std::istream &s, UInt8 &i) -{ - return s >> (unsigned char &)i; -} -inline std::istream &operator>>(std::istream &s, UInt16 &i) -{ - return s >> (unsigned short &)i; -} -inline std::istream &operator>>(std::istream &s, UInt32 &i) -{ - return s >> (unsigned int &)i; -} -#endif diff --git a/src/lib/platform/dfwhook.h b/src/lib/platform/dfwhook.h index 8822663ae..4bb64923b 100644 --- a/src/lib/platform/dfwhook.h +++ b/src/lib/platform/dfwhook.h @@ -18,14 +18,6 @@ #pragma once -// hack: vs2005 doesn't declare _WIN32_WINNT, so we need to hard code it. -// however, some say that this should be hard coded since it defines the -// target system, but since this is suposed to compile on pre-XP, maybe -// we should just leave it like this. -#if _MSC_VER == 1400 -#define _WIN32_WINNT 0x0400 -#endif - #include "base/EventTypes.h" #define WIN32_LEAN_AND_MEAN