gtest-string.h (googletest-release-1.10.0) | : | gtest-string.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 41 | skipping to change at line 41 | |||
// | // | |||
// This header file declares the String class and functions used internally by | // This header file declares the String class and functions used internally by | |||
// Google Test. They are subject to change without notice. They should not used | // Google Test. They are subject to change without notice. They should not used | |||
// by code external to Google Test. | // by code external to Google Test. | |||
// | // | |||
// This header file is #included by gtest-internal.h. | // This header file is #included by gtest-internal.h. | |||
// It should not be #included by other files. | // It should not be #included by other files. | |||
// GOOGLETEST_CM0001 DO NOT DELETE | // GOOGLETEST_CM0001 DO NOT DELETE | |||
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ | #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ | |||
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ | #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ | |||
#ifdef __BORLANDC__ | #ifdef __BORLANDC__ | |||
// string.h is not guaranteed to provide strcpy on C++ Builder. | // string.h is not guaranteed to provide strcpy on C++ Builder. | |||
# include <mem.h> | # include <mem.h> | |||
#endif | #endif | |||
#include <string.h> | #include <string.h> | |||
#include <cstdint> | ||||
#include <string> | #include <string> | |||
#include "gtest/internal/gtest-port.h" | #include "gtest/internal/gtest-port.h" | |||
namespace testing { | namespace testing { | |||
namespace internal { | namespace internal { | |||
// String - an abstract class holding static string utilities. | // String - an abstract class holding static string utilities. | |||
class GTEST_API_ String { | class GTEST_API_ String { | |||
public: | public: | |||
skipping to change at line 151 | skipping to change at line 152 | |||
const wchar_t* rhs); | const wchar_t* rhs); | |||
// Returns true if and only if the given string ends with the given suffix, | // Returns true if and only if the given string ends with the given suffix, | |||
// ignoring case. Any string is considered to end with an empty suffix. | // ignoring case. Any string is considered to end with an empty suffix. | |||
static bool EndsWithCaseInsensitive( | static bool EndsWithCaseInsensitive( | |||
const std::string& str, const std::string& suffix); | const std::string& str, const std::string& suffix); | |||
// Formats an int value as "%02d". | // Formats an int value as "%02d". | |||
static std::string FormatIntWidth2(int value); // "%02d" for width == 2 | static std::string FormatIntWidth2(int value); // "%02d" for width == 2 | |||
// Formats an int value to given width with leading zeros. | ||||
static std::string FormatIntWidthN(int value, int width); | ||||
// Formats an int value as "%X". | // Formats an int value as "%X". | |||
static std::string FormatHexInt(int value); | static std::string FormatHexInt(int value); | |||
// Formats an int value as "%X". | // Formats an int value as "%X". | |||
static std::string FormatHexUInt32(UInt32 value); | static std::string FormatHexUInt32(uint32_t value); | |||
// Formats a byte as "%02X". | // Formats a byte as "%02X". | |||
static std::string FormatByte(unsigned char value); | static std::string FormatByte(unsigned char value); | |||
private: | private: | |||
String(); // Not meant to be instantiated. | String(); // Not meant to be instantiated. | |||
}; // class String | }; // class String | |||
// Gets the content of the stringstream's buffer as an std::string. Each '\0' | // Gets the content of the stringstream's buffer as an std::string. Each '\0' | |||
// character in the buffer is replaced with "\\0". | // character in the buffer is replaced with "\\0". | |||
GTEST_API_ std::string StringStreamToString(::std::stringstream* stream); | GTEST_API_ std::string StringStreamToString(::std::stringstream* stream); | |||
} // namespace internal | } // namespace internal | |||
} // namespace testing | } // namespace testing | |||
#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ | #endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ | |||
End of changes. 5 change blocks. | ||||
3 lines changed or deleted | 7 lines changed or added |