Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
35087841
Commit
35087841
authored
Dec 14, 2009
by
zhanyong.wan
Browse files
Stops supporting MSVC 7.1 with exceptions disabled.
parent
44bafcb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+4
-0
scons/SConstruct.common
scons/SConstruct.common
+1
-0
No files found.
include/gtest/internal/gtest-port.h
View file @
35087841
...
@@ -269,6 +269,10 @@
...
@@ -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
...
...
scons/SConstruct.common
View file @
35087841
...
@@ -117,6 +117,7 @@ class SConstructHelper:
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment