summaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorTroy Holsapple <troy.holsapple@gmail.com>2018-02-08 06:06:00 (GMT)
committerTroy Holsapple <troy.holsapple@gmail.com>2018-02-08 06:06:00 (GMT)
commitc8510504ddf3bd9e486fdce076bdf5dba62d18bb (patch)
treeffdf7a37e88e36216955c70f209afacdb3b506e9 /googletest/src
parenta3c73ed28d7995b18d48027aee740ad827fcc157 (diff)
downloadgoogletest-c8510504ddf3bd9e486fdce076bdf5dba62d18bb.zip
googletest-c8510504ddf3bd9e486fdce076bdf5dba62d18bb.tar.gz
googletest-c8510504ddf3bd9e486fdce076bdf5dba62d18bb.tar.bz2
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest-filepath.cc2
-rw-r--r--googletest/src/gtest-printers.cc4
-rw-r--r--googletest/src/gtest.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc
index a1fc0e3..6b76ea0 100644
--- a/googletest/src/gtest-filepath.cc
+++ b/googletest/src/gtest-filepath.cc
@@ -128,7 +128,7 @@ FilePath FilePath::RemoveExtension(const char* extension) const {
return *this;
}
-// Returns a pointer to the last occurence of a valid path separator in
+// Returns a pointer to the last occurrence of a valid path separator in
// the FilePath. On Windows, for example, both '/' and '\' are valid path
// separators. Returns NULL if no path separator was found.
const char* FilePath::FindLastPathSeparator() const {
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc
index 1bdf243..fe70edc 100644
--- a/googletest/src/gtest-printers.cc
+++ b/googletest/src/gtest-printers.cc
@@ -124,7 +124,7 @@ namespace internal {
// Depending on the value of a char (or wchar_t), we print it in one
// of three formats:
// - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
-// - as a hexidecimal escape sequence (e.g. '\x7F'), or
+// - as a hexadecimal escape sequence (e.g. '\x7F'), or
// - as a special escape sequence (e.g. '\r', '\n').
enum CharFormat {
kAsIs,
@@ -231,7 +231,7 @@ void PrintCharAndCodeTo(Char c, ostream* os) {
return;
*os << " (" << static_cast<int>(c);
- // For more convenience, we print c's code again in hexidecimal,
+ // For more convenience, we print c's code again in hexadecimal,
// unless c was already printed in the form '\x##' or the code is in
// [1, 9].
if (format == kHexEscape || (1 <= c && c <= 9)) {
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 2c25f83..ee555bc 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -1718,7 +1718,7 @@ AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT
// Utility functions for encoding Unicode text (wide strings) in
// UTF-8.
-// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8
+// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
// like this:
//
// Code-point length Encoding