aboutsummaryrefslogtreecommitdiffstats
path: root/scons/SConscript.common
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-12-16 23:34:59 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-12-16 23:34:59 +0000
commit88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384 (patch)
tree2ccb8a80d9d1ee12db0de85b03dc9e9ed957b25a /scons/SConscript.common
parent075b76bb96f1b6eac7dde41b47de0dd456b0f473 (diff)
downloadgoogletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.tar.gz
googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.tar.bz2
googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.zip
Removes uses of GTEST_HAS_STD_STRING.
Diffstat (limited to 'scons/SConscript.common')
-rw-r--r--scons/SConscript.common3
1 files changed, 0 insertions, 3 deletions
diff --git a/scons/SConscript.common b/scons/SConscript.common
index a49cf0a3..7fda32e1 100644
--- a/scons/SConscript.common
+++ b/scons/SConscript.common
@@ -88,9 +88,6 @@ class EnvCreator:
if env['PLATFORM'] == 'win32':
env.Append(CCFLAGS=['/EHsc'])
env.Append(CPPDEFINES='_HAS_EXCEPTIONS=1')
- # Undoes the _TYPEINFO_ hack, which is unnecessary and only creates
- # trouble when exceptions are enabled.
- cls._Remove(env, 'CPPDEFINES', '_TYPEINFO_')
cls._Remove(env, 'CPPDEFINES', '_HAS_EXCEPTIONS=0')
else:
env.Append(CCFLAGS='-fexceptions')