Fixes a MSVC warning (by Vlad Losev); fixes SConscript to work with VC 7.1 and exceptions enabled (by Zhanyong Wan).

3 files changed, 7 insertions, 3 deletions

diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index d9e7a19a..a304b0ae 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -735,7 +735,6 @@ namespace posix {
 
 typedef struct _stat stat_struct;
 
-inline int chdir(const char* dir) { return ::_chdir(dir); }
 // We cannot write ::_fileno() as MSVC defines it as a macro.
 inline int fileno(FILE* file) { return _fileno(file); }
 inline int isatty(int fd) { return ::_isatty(fd); }
@@ -757,7 +756,6 @@ inline bool IsDir(const stat_struct& st) {
 
 typedef struct stat stat_struct;
 
-using ::chdir;
 using ::fileno;
 using ::isatty;
 using ::stat;
@@ -780,6 +778,8 @@ inline const char* strncpy(char* dest, const char* src, size_t n) {
   return ::strncpy(dest, src, n);
 }
 
+inline int chdir(const char* dir) { return ::chdir(dir); }
+
 inline FILE* fopen(const char* path, const char* mode) {
   return ::fopen(path, mode);
 }
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)
diff --git a/test/gtest_output_test_.cc b/test/gtest_output_test_.cc
index c867e159..a47560be 100644
--- a/test/gtest_output_test_.cc
+++ b/test/gtest_output_test_.cc
@@ -238,7 +238,6 @@ void AdHocTest() {
   EXPECT_EQ(2, 3);
 }
 
-
 // Runs all TESTs, all TEST_Fs, and the ad hoc test.
 int RunAllTests() {
   AdHocTest();