diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-08-31 23:51:23 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-08-31 23:51:23 +0000 |
| commit | 2b43a9ecd16edc1ec55429967e0f2de1aaf8e8bb (patch) | |
| tree | 77c7cf946b35c5735d70023342f0d21238503f3c /src | |
| parent | 0ea67f88aea208e7ef13c91b374b352679beab38 (diff) | |
| download | googletest-2b43a9ecd16edc1ec55429967e0f2de1aaf8e8bb.tar.gz googletest-2b43a9ecd16edc1ec55429967e0f2de1aaf8e8bb.tar.bz2 googletest-2b43a9ecd16edc1ec55429967e0f2de1aaf8e8bb.zip | |
Adds mutable_impl() and impl() to PolymorphicMatcher (by Zhanyong Wan); Enables gMock to compile with VC 7.1 (by Vlad Losev).
Diffstat (limited to 'src')
| -rw-r--r-- | src/gmock-printers.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gmock-printers.cc b/src/gmock-printers.cc index 922a7b2d..0473dba1 100644 --- a/src/gmock-printers.cc +++ b/src/gmock-printers.cc @@ -55,10 +55,12 @@ namespace { using ::std::ostream; -#ifdef _WIN32_WCE +#ifdef _WIN32_WCE // Windows CE does not define _snprintf_s. #define snprintf _snprintf -#elif GTEST_OS_WINDOWS +#elif _MSC_VER >= 1400 // VC 8.0 and later deprecate snprintf and _snprintf. #define snprintf _snprintf_s +#elif _MSC_VER +#define snprintf _snprintf #endif // Prints a segment of bytes in the given object. |