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

1 files changed, 2 insertions, 2 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);
 }