diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-20 15:46:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 15:46:26 (GMT) |
| commit | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (patch) | |
| tree | 0fae2f56aba6c1275fdca61d4ef6f2131f2e7f12 /googletest | |
| parent | c62c79432bd23762a99a6658380fd202f858d7a9 (diff) | |
| parent | a02af2f689426aa9622b06643f53ed27fa6dc8a5 (diff) | |
| download | googletest-2a151c93c180ac765c27c5f2e37af9366abd4d55.zip googletest-2a151c93c180ac765c27c5f2e37af9366abd4d55.tar.gz googletest-2a151c93c180ac765c27c5f2e37af9366abd4d55.tar.bz2 | |
Merge pull request #1676 from gennadiycivil/master
code merge
Diffstat (limited to 'googletest')
| -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 bc35c34..dbe703b 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -522,11 +522,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 |