From 3e54f5a3715f2c0b4425e55cc5d42dd42f4eda54 Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Tue, 31 Mar 2009 00:03:56 +0000
Subject: Fixes a MSVC warning (by Vlad Losev); fixes SConscript to work with
 VC 7.1 and exceptions enabled (by Zhanyong Wan).

---
 scons/SConscript | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'scons/SConscript')

diff --git a/scons/SConscript b/scons/SConscript
index 2e0edf3e..88357ca2 100644
--- a/scons/SConscript
+++ b/scons/SConscript
@@ -121,6 +121,11 @@ platform = env_with_exceptions['PLATFORM']
 if platform == 'win32':
   env_with_exceptions.Append(CCFLAGS = ['/EHsc'])
   env_with_exceptions.Append(CPPDEFINES = '_HAS_EXCEPTIONS=1')
+  # Undoes the _TYPEINFO_ hack, which is unnecessary and only creates
+  # trouble when exceptions are enabled.
+  cppdefines = env_with_exceptions['CPPDEFINES']
+  if '_TYPEINFO_' in cppdefines:
+    cppdefines.remove('_TYPEINFO_')
 
 gtest_ex_obj = env_with_exceptions.Object(target='gtest_ex',
                                           source=gtest_source)
-- 
cgit v1.2.3