Merge branch 'master' of https://github.com/google/googletest
This commit is contained in:
commit
7a2563a514
|
@ -980,7 +980,7 @@ using ::std::tuple_size;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
|
// _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
|
# define GTEST_HAS_CXXABI_H_ 1
|
||||||
#else
|
#else
|
||||||
# define GTEST_HAS_CXXABI_H_ 0
|
# define GTEST_HAS_CXXABI_H_ 0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user