Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Unified Diff: testing/gmock/include/gmock/internal/gmock-internal-utils.h

Issue 521012: Update gmock and gtest. (Closed)
Patch Set: update readme Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: testing/gmock/include/gmock/internal/gmock-internal-utils.h
diff --git a/testing/gmock/include/gmock/internal/gmock-internal-utils.h b/testing/gmock/include/gmock/internal/gmock-internal-utils.h
index 7b173350394b8ec2c8123f274d5edb3478d09db0..0c33fdd00583b58bd5dc04f1552bfd70e1c139ab 100644
--- a/testing/gmock/include/gmock/internal/gmock-internal-utils.h
+++ b/testing/gmock/include/gmock/internal/gmock-internal-utils.h
@@ -640,15 +640,15 @@ class NativeArray {
// Initializes this object; makes a copy of the input array if
// 'relation' is kCopy.
- void Init(const Element* array, size_t size, RelationToSource relation) {
+ void Init(const Element* array, size_t a_size, RelationToSource relation) {
if (relation == kReference) {
array_ = array;
} else {
- Element* const copy = new Element[size];
- CopyArray(array, size, copy);
+ Element* const copy = new Element[a_size];
+ CopyArray(array, a_size, copy);
array_ = copy;
}
- size_ = size;
+ size_ = a_size;
relation_to_source_ = relation;
}
« no previous file with comments | « testing/gmock/include/gmock/gmock-spec-builders.h ('k') | testing/gmock/include/gmock/internal/gmock-port.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698