| 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;
|
| }
|
|
|
|
|