Merge branch 'master' into deprecate

2018-07-20 15:53:16 -04:00
parent 1f9c668a04 2a151c93c1
commit fd4f7cc729
8 changed files with 71 additions and 36 deletions
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -538,11 +538,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 #endif  // !defined(GTEST_HAS_STD_STRING)

 #ifndef GTEST_HAS_GLOBAL_STRING
-// The user didn't tell us whether ::string is available, so we need
-// to figure it out.
-
 # define GTEST_HAS_GLOBAL_STRING 0
-
 #endif  // GTEST_HAS_GLOBAL_STRING

 #ifndef GTEST_HAS_STD_WSTRING