gtest-message.h (googletest-release-1.10.0) | : | gtest-message.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 47 | skipping to change at line 47 | |||
// They are clearly marked by comments like this: | // They are clearly marked by comments like this: | |||
// | // | |||
// // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. | // // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. | |||
// | // | |||
// Such code is NOT meant to be used by a user directly, and is subject | // Such code is NOT meant to be used by a user directly, and is subject | |||
// to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user | // to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user | |||
// program! | // program! | |||
// GOOGLETEST_CM0001 DO NOT DELETE | // GOOGLETEST_CM0001 DO NOT DELETE | |||
#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ | #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ | |||
#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ | #define GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ | |||
#include <limits> | #include <limits> | |||
#include <memory> | #include <memory> | |||
#include <sstream> | ||||
#include "gtest/internal/gtest-port.h" | #include "gtest/internal/gtest-port.h" | |||
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ | GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ | |||
/* class A needs to have dll-interface to be used by clients of class B */) | /* class A needs to have dll-interface to be used by clients of class B */) | |||
// Ensures that there is at least one operator<< in the global namespace. | // Ensures that there is at least one operator<< in the global namespace. | |||
// See Message& operator<<(...) below for why. | // See Message& operator<<(...) below for why. | |||
void operator<<(const testing::internal::Secret&, int); | void operator<<(const testing::internal::Secret&, int); | |||
skipping to change at line 218 | skipping to change at line 219 | |||
template <typename T> | template <typename T> | |||
std::string StreamableToString(const T& streamable) { | std::string StreamableToString(const T& streamable) { | |||
return (Message() << streamable).GetString(); | return (Message() << streamable).GetString(); | |||
} | } | |||
} // namespace internal | } // namespace internal | |||
} // namespace testing | } // namespace testing | |||
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 | GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 | |||
#endif // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ | #endif // GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 3 lines changed or added |