aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/samples
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-08-09 11:03:27 +0200
committerHerbert Thielen <thielen@hs-worms.de>2017-08-09 11:03:27 +0200
commite022dcded846c36c14dcbf97d49de9ca68ddd6fc (patch)
tree8e65719ddf45c8f99b2ceae1a8dc24c84d7f2a90 /googletest/samples
parent6b896774815127c11de3aa4400454e88b9763020 (diff)
parent461713fec4603806d2049835c0790bf94d2db631 (diff)
downloadgoogletest-e022dcded846c36c14dcbf97d49de9ca68ddd6fc.tar.gz
googletest-e022dcded846c36c14dcbf97d49de9ca68ddd6fc.tar.bz2
googletest-e022dcded846c36c14dcbf97d49de9ca68ddd6fc.zip
Merge branch 'master' into hethi/remove-old-docs
Diffstat (limited to 'googletest/samples')
-rw-r--r--googletest/samples/sample1.cc2
-rw-r--r--googletest/samples/sample3_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/googletest/samples/sample1.cc b/googletest/samples/sample1.cc
index f171e260..7c08b28f 100644
--- a/googletest/samples/sample1.cc
+++ b/googletest/samples/sample1.cc
@@ -55,7 +55,7 @@ bool IsPrime(int n) {
// Try to divide n by every odd number i, starting from 3
for (int i = 3; ; i += 2) {
- // We only have to try i up to the squre root of n
+ // We only have to try i up to the square root of n
if (i > n/i) break;
// Now, we have i <= n/i < n.
diff --git a/googletest/samples/sample3_unittest.cc b/googletest/samples/sample3_unittest.cc
index bf3877d0..a4fbe5a0 100644
--- a/googletest/samples/sample3_unittest.cc
+++ b/googletest/samples/sample3_unittest.cc
@@ -72,7 +72,7 @@ class QueueTest : public testing::Test {
// accessed from sub-classes.
// virtual void SetUp() will be called before each test is run. You
- // should define it if you need to initialize the varaibles.
+ // should define it if you need to initialize the variables.
// Otherwise, this can be skipped.
virtual void SetUp() {
q1_.Enqueue(1);