diff options
| author | Peter Collingbourne <pcc@google.com> | 2018-01-11 19:36:25 -0800 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2018-01-17 20:29:10 -0800 |
| commit | ba99a04be2d522015670b0c89761604a78b1ea5b (patch) | |
| tree | cba64f98a5e2764119d301947d150a4ec9d2e3a0 | |
| parent | 1b077667bd950be0f5b106e033fb820b008ad0c0 (diff) | |
| download | googletest-ba99a04be2d522015670b0c89761604a78b1ea5b.tar.gz googletest-ba99a04be2d522015670b0c89761604a78b1ea5b.tar.bz2 googletest-ba99a04be2d522015670b0c89761604a78b1ea5b.zip | |
Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
If _MSC_VER is defined, it means that we are using the Microsoft
ABI, so cxxabi.h (which is associated with the Itanium ABI) will not
be available.
| -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 58ab7fdf..01ad5dac 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 |