Fixes a slew of compiler warnings and turns on "warning as error" in the scons build.

1 files changed, 4 insertions, 4 deletions

diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h
index 7b173350..0c33fdd0 100644
--- a/include/gmock/internal/gmock-internal-utils.h
+++ b/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;
   }