diff options
author | Alexey Samsonov <samsonov@google.com> | 2012-12-06 23:04:41 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2012-12-06 23:04:41 +0000 |
commit | 57f7dafcb769852a21870148e91535421c45d037 (patch) | |
tree | 26c5ce5721ac5dba25e846cd0af1ee126812fa14 /utils/unittest/googletest/include/gtest/internal/gtest-internal.h | |
parent | 873a1dd7d679ac9a9a92a93a4d2bbb157878efb4 (diff) | |
download | llvm-57f7dafcb769852a21870148e91535421c45d037.tar.gz llvm-57f7dafcb769852a21870148e91535421c45d037.tar.bz2 llvm-57f7dafcb769852a21870148e91535421c45d037.tar.xz |
Modify the LLVM checkout of googletest:
1) don't delete gtest-all.cc (which is used to gather all gtest source
files in a single file)
2) make including LLVMSupport headers optional (on by default).
Sanitizer tools may want to use their own versions of googletest
compiled with specific flags, instead of the common googletest
library used for all other LLVM/Clang unittests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169559 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest/include/gtest/internal/gtest-internal.h')
-rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-internal.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-internal.h b/utils/unittest/googletest/include/gtest/internal/gtest-internal.h index f8a5cc9447..a94bf28421 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-internal.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-internal.h @@ -56,7 +56,9 @@ #include "gtest/internal/gtest-filepath.h" #include "gtest/internal/gtest-type-util.h" +#if !GTEST_NO_LLVM_RAW_OSTREAM #include "llvm/Support/raw_os_ostream.h" +#endif // Due to C++ preprocessor weirdness, we need double indirection to // concatenate two tokens when one of them is __LINE__. Writing @@ -100,6 +102,7 @@ // std::ostream with an implicit conversion to raw_ostream& and stream // to that. This causes the compiler to prefer std::ostream overloads // but still find raw_ostream& overloads. +#if !GTEST_NO_LLVM_RAW_OSTREAM namespace llvm { class convertible_fwd_ostream : public std::ostream { raw_os_ostream ros_; @@ -115,6 +118,12 @@ inline void GTestStreamToHelper(std::ostream* os, const T& val) { llvm::convertible_fwd_ostream cos(*os); cos << val; } +#else +template <typename T> +inline void GTestStreamToHelper(std::ostream* os, const T& val) { + *os << val; +} +#endif class ProtocolMessage; namespace proto2 { class Message; } |