Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Googletest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Meng
Googletest
Commits
2eb43960
Commit
2eb43960
authored
6 years ago
by
杜修杏
Browse files
Options
Downloads
Patches
Plain Diff
Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio
parent
5b19054b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
googlemock/docs/CookBook.md
+2
-2
2 additions, 2 deletions
googlemock/docs/CookBook.md
googlemock/include/gmock/gmock-generated-function-mockers.h.pump
+2
-2
2 additions, 2 deletions
...ock/include/gmock/gmock-generated-function-mockers.h.pump
with
4 additions
and
4 deletions
googlemock/docs/CookBook.md
+
2
−
2
View file @
2eb43960
...
...
@@ -2247,7 +2247,7 @@ enum class AccessLevel { kInternal, kPublic };
class
Buzz
{
public:
explicit
Buzz
(
AccessLevel
access
)
{
…
}
explicit
Buzz
(
AccessLevel
access
)
{
...
}
...
};
...
...
@@ -2320,7 +2320,7 @@ Note that `ByMove()` is essential here - if you drop it, the code won’t compil
Quiz time! What do you think will happen if a
`Return(ByMove(...))`
action is
performed more than once (e.g. you write
`
…
.WillRepeatedly(Return(ByMove(...)));`
)? Come think of it, after the first
`.WillRepeatedly(Return(ByMove(...)));`
)? Come think of it, after the first
time the action runs, the source value will be consumed (since it’s a move-only
value), so the next time around, there’s no value to move from -- you’ll get a
run-time error that
`Return(ByMove(...))`
can only be run once.
...
...
This diff is collapsed.
Click to expand it.
googlemock/include/gmock/gmock-generated-function-mockers.h.pump
+
2
−
2
View file @
2eb43960
...
...
@@ -114,7 +114,7 @@ class FunctionMocker<R($As)> : public
//
// class MockClass {
// // Overload 1
// MockSpec<string&()> gmock_GetName() {
…
}
// MockSpec<string&()> gmock_GetName() {
...
}
// // Overload 2. Declared const so that the compiler will generate an
// // error when trying to resolve between this and overload 4 in
// // 'gmock_GetName(WithoutMatchers(), nullptr)'.
...
...
@@ -125,7 +125,7 @@ class FunctionMocker<R($As)> : public
// }
//
// // Overload 3
// const string& gmock_GetName() const {
…
}
// const string& gmock_GetName() const {
...
}
// // Overload 4
// MockSpec<const string&()> gmock_GetName(
// const WithoutMatchers&, const Function<const string&()>*) const {
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment