From f66d277918bf69e91eb37d4c4328161b03ac5247 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 12 Jul 2018 19:04:49 -0700 Subject: [PATCH] msvc 9 compat --- src/misc/pv/sharedPtr.h | 9 +++++++++ src/pv/pvType.h | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/misc/pv/sharedPtr.h b/src/misc/pv/sharedPtr.h index 5bc968a..d6d1378 100644 --- a/src/misc/pv/sharedPtr.h +++ b/src/misc/pv/sharedPtr.h @@ -71,6 +71,12 @@ // GCC >=4.0.0 # define SHARED_FROM_TR1 +#elif defined(_MSC_VER) && _MSC_VER==1500 +// MSVC 2009 (eg. Visual C++ for Python 2.7) +// Dinkumware _CPPLIB_VER=505 +// Has std::tr1::shared_ptr in +# define SHARED_TR1_FROM_STD + #elif defined(_MSC_VER) && (_MSC_VER>1500 || defined(_HAS_TR1)) // MSVC > 2008, or 2008 w/ SP1 # define SHARED_FROM_TR1 @@ -120,6 +126,9 @@ namespace std { #endif // DEBUG_SHARED_PTR +#elif defined(SHARED_TR1_FROM_STD) +# include + #elif defined(SHARED_FROM_TR1) # include diff --git a/src/pv/pvType.h b/src/pv/pvType.h index 46f3a75..7780e9a 100644 --- a/src/pv/pvType.h +++ b/src/pv/pvType.h @@ -30,6 +30,16 @@ typedef unsigned int uintptr_t; #define INT64_MAX (0x7fffffffffffffffLL) #define UINT64_MAX (0xffffffffffffffffULL) #endif +#elif _MSC_VER==1500 +#include +typedef epicsUInt8 uint8_t; +typedef epicsInt8 int8_t; +typedef epicsUInt16 uint16_t; +typedef epicsInt16 int16_t; +typedef epicsUInt32 uint32_t; +typedef epicsInt32 int32_t; +typedef epicsUInt64 uint64_t; +typedef epicsInt64 int64_t; #else #include #endif