Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
52b6ca34
Commit
52b6ca34
authored
Sep 01, 2017
by
Gennadiy Civil
Committed by
GitHub
Sep 01, 2017
Browse files
Merge pull request #783 from tobbi/cppcheck_perf_fixes
Performance fixes reported by cppcheck
parents
e4f6c0b3
08d76be4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
googletest/test/gtest-param-test_test.cc
googletest/test/gtest-param-test_test.cc
+4
-4
googletest/test/gtest_unittest.cc
googletest/test/gtest_unittest.cc
+1
-1
No files found.
googletest/test/gtest-param-test_test.cc
View file @
52b6ca34
...
...
@@ -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
);
}
...
...
googletest/test/gtest_unittest.cc
View file @
52b6ca34
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment