diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-14 19:14:04 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-14 19:14:04 +0000 |
| commit | 3508784108a38d673a0c7d14c897e7a51b2a7e36 (patch) | |
| tree | fe0e52fe02334101e8675e70e79806aec8b440a7 | |
| parent | 44bafcb62d0f33fbc9aafb5492b245c949850df8 (diff) | |
| download | googletest-3508784108a38d673a0c7d14c897e7a51b2a7e36.tar.gz googletest-3508784108a38d673a0c7d14c897e7a51b2a7e36.tar.bz2 googletest-3508784108a38d673a0c7d14c897e7a51b2a7e36.zip | |
Stops supporting MSVC 7.1 with exceptions disabled.
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 4 | ||||
| -rw-r--r-- | scons/SConstruct.common | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 603e7f1b..c0a1f117 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -269,6 +269,10 @@ // ::std::string is not available is MSVC 7.1 or lower with exceptions // disabled. #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 #else #define GTEST_HAS_STD_STRING 1 diff --git a/scons/SConstruct.common b/scons/SConstruct.common index ed896d09..3f9d9ca0 100644 --- a/scons/SConstruct.common +++ b/scons/SConstruct.common @@ -117,6 +117,7 @@ class SConstructHelper: 'STRICT', 'WIN32_LEAN_AND_MEAN', '_HAS_EXCEPTIONS=0', + 'GTEST_ALLOW_VC71_WITHOUT_EXCEPTIONS_=1', ], LIBPATH=['#/$MAIN_DIR/lib'], LINKFLAGS=['-MACHINE:x86', # Enable safe SEH (not supp. on x64) |