diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-20 19:53:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 19:53:16 (GMT) |
| commit | fd4f7cc7299e8fde91d45ba6685fbd99698814e0 (patch) | |
| tree | 37786e74b9947f7bf3b677629aaf8cde10c1d85e /googletest/include | |
| parent | 1f9c668a0452148f725b242079f70d65d3e93153 (diff) | |
| parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
| download | googletest-fd4f7cc7299e8fde91d45ba6685fbd99698814e0.zip googletest-fd4f7cc7299e8fde91d45ba6685fbd99698814e0.tar.gz googletest-fd4f7cc7299e8fde91d45ba6685fbd99698814e0.tar.bz2 | |
Merge branch 'master' into deprecate
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 513b168..fe84549 100644 --- 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 |