diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-24 17:36:05 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-24 17:36:05 (GMT) |
| commit | 7a2563a514563145d82f02b5b350cba1af33af67 (patch) | |
| tree | fd5129c88e106384f612db649d06c4aba1a8bd74 /googletest | |
| parent | 06c3cce86709191d48e14bf4c27d086a79f2e99f (diff) | |
| parent | ab9c44ccf0f73eff9cdcfdcca14ebaa6d83d8062 (diff) | |
| download | googletest-7a2563a514563145d82f02b5b350cba1af33af67.zip googletest-7a2563a514563145d82f02b5b350cba1af33af67.tar.gz googletest-7a2563a514563145d82f02b5b350cba1af33af67.tar.bz2 | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 58ab7fd..01ad5da 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -980,7 +980,7 @@ using ::std::tuple_size; #endif // _LIBCPP_VERSION is defined by the libc++ library from the LLVM project. -#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION) +#if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER)) # define GTEST_HAS_CXXABI_H_ 1 #else # define GTEST_HAS_CXXABI_H_ 0 |