gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stops supporting MSVC 7.1 with exceptions disabled.

Browse Source
This commit is contained in:
zhanyong.wan
2009-12-14 19:14:04 +00:00
parent 44bafcb62d
commit 3508784108
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/gtest/internal/gtest-port.h
View File

@@ -269,6 +269,10 @@
// ::std::string is not available is MSVC 7.1 or lower with exceptions // ::std::string is not available is MSVC 7.1 or lower with exceptions
// disabled. // disabled.
#if defined(_MSC_VER) && (_MSC_VER < 1400) && !GTEST_HAS_EXCEPTIONS #if defined(_MSC_VER) && (_MSC_VER < 1400) && !GTEST_HAS_EXCEPTIONS
#if !GTEST_ALLOW_VC71_WITHOUT_EXCEPTIONS_
#error "When compiling gtest using MSVC 7.1, exceptions must be enabled."
#error "Otherwise std::string and std::vector don't compile."
#endif
#define GTEST_HAS_STD_STRING 0 #define GTEST_HAS_STD_STRING 0
#else #else
#define GTEST_HAS_STD_STRING 1 #define GTEST_HAS_STD_STRING 1

1
scons/SConstruct.common
View File

@@ -117,6 +117,7 @@ class SConstructHelper:
'STRICT', 'STRICT',
'WIN32_LEAN_AND_MEAN', 'WIN32_LEAN_AND_MEAN',
'_HAS_EXCEPTIONS=0', '_HAS_EXCEPTIONS=0',
'GTEST_ALLOW_VC71_WITHOUT_EXCEPTIONS_=1',
], ],
LIBPATH=['#/$MAIN_DIR/lib'], LIBPATH=['#/$MAIN_DIR/lib'],
LINKFLAGS=['-MACHINE:x86', # Enable safe SEH (not supp. on x64) LINKFLAGS=['-MACHINE:x86', # Enable safe SEH (not supp. on x64)