summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-09-01 17:52:33 (GMT)
committerGitHub <noreply@github.com>2017-09-01 17:52:33 (GMT)
commit52b6ca3428ee926dd446e4a796e7c1b6a1bf8df8 (patch)
tree2a4a146e8ddd40f3f366730f6f32fb7029808aa3 /googletest
parente4f6c0b358a4a08ecb7adc7235ec4e07596993d3 (diff)
parent08d76be4cc597863f6e6b43accbf299d0055ac54 (diff)
downloadgoogletest-52b6ca3428ee926dd446e4a796e7c1b6a1bf8df8.zip
googletest-52b6ca3428ee926dd446e4a796e7c1b6a1bf8df8.tar.gz
googletest-52b6ca3428ee926dd446e4a796e7c1b6a1bf8df8.tar.bz2
Merge pull request #783 from tobbi/cppcheck_perf_fixes
Performance fixes reported by cppcheck
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/gtest-param-test_test.cc8
-rw-r--r--googletest/test/gtest_unittest.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc
index 8b278bb..857f6c5 100644
--- a/googletest/test/gtest-param-test_test.cc
+++ b/googletest/test/gtest-param-test_test.cc
@@ -141,7 +141,7 @@ void VerifyGenerator(const ParamGenerator<T>& generator,
<< ", expected_values[i] is " << PrintValue(expected_values[i])
<< ", *it is " << PrintValue(*it)
<< ", and 'it' is an iterator created with the copy constructor.\n";
- it++;
+ ++it;
}
EXPECT_TRUE(it == generator.end())
<< "At the presumed end of sequence when accessing via an iterator "
@@ -161,7 +161,7 @@ void VerifyGenerator(const ParamGenerator<T>& generator,
<< ", expected_values[i] is " << PrintValue(expected_values[i])
<< ", *it is " << PrintValue(*it)
<< ", and 'it' is an iterator created with the copy constructor.\n";
- it++;
+ ++it;
}
EXPECT_TRUE(it == generator.end())
<< "At the presumed end of sequence when accessing via an iterator "
@@ -196,7 +196,7 @@ TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) {
<< "element same as its source points to";
// Verifies that iterator assignment works as expected.
- it++;
+ ++it;
EXPECT_FALSE(*it == *it2);
it2 = it;
EXPECT_TRUE(*it == *it2) << "Assigned iterators must point to the "
@@ -215,7 +215,7 @@ TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) {
// Verifies that prefix and postfix operator++() advance an iterator
// all the same.
it2 = it;
- it++;
+ ++it;
++it2;
EXPECT_TRUE(*it == *it2);
}
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index 0ae8e03..f84def9 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -7655,7 +7655,7 @@ TEST(NativeArrayTest, MethodsWork) {
EXPECT_EQ(0, *it);
++it;
EXPECT_EQ(1, *it);
- it++;
+ ++it;
EXPECT_EQ(2, *it);
++it;
EXPECT_EQ(na.end(), it);