diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-01-29 06:34:44 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-01-29 06:34:44 +0000 |
| commit | f841fdc9c03f36a227321280720260a03e754f35 (patch) | |
| tree | 325157afb1a1a9d2bd48f115c82c6231e6e2af15 /src | |
| parent | 357070773163979334f922aea127388de17c26fa (diff) | |
| download | googletest-f841fdc9c03f36a227321280720260a03e754f35.tar.gz | |
Add GTEST_MOVE macro, to support mocking methods with move-only return types.
Add GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
git-svn-id: http://googletest.googlecode.com/svn/trunk@676 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest-printers.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gtest-printers.cc b/src/gtest-printers.cc index 0db5b44..29c799a 100644 --- a/src/gtest-printers.cc +++ b/src/gtest-printers.cc @@ -57,6 +57,7 @@ using ::std::ostream; // Prints a segment of bytes in the given object. GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ +GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start, size_t count, ostream* os) { char text[5] = ""; @@ -254,6 +255,7 @@ void PrintTo(wchar_t wc, ostream* os) { // and may not be NUL-terminated. template <typename CharType> GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ +GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ static void PrintCharsAsStringTo( const CharType* begin, size_t len, ostream* os) { const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\""; @@ -276,6 +278,7 @@ static void PrintCharsAsStringTo( // 'begin'. CharType must be either char or wchar_t. template <typename CharType> GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ +GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ static void UniversalPrintCharArray( const CharType* begin, size_t len, ostream* os) { // The code |