aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/repeated_field.h
diff options
context:
space:
mode:
authorliujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2010-12-06 06:20:14 +0000
committerliujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2010-12-06 06:20:14 +0000
commit5d8d2b054224bc5fdc73b886f8e765c360f86734 (patch)
tree650fa406aa2dbacbfb4ff5b640411cb5643d0218 /src/google/protobuf/repeated_field.h
parent2726e7a6ebd72eec6f66abe4ced3c88983f20b8e (diff)
downloadprotobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.tar.gz
protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.tar.bz2
protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.zip
Fix issues: 200 202 211 215 237 246.
Diffstat (limited to 'src/google/protobuf/repeated_field.h')
-rw-r--r--src/google/protobuf/repeated_field.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h
index f380e7c0..6080ddcc 100644
--- a/src/google/protobuf/repeated_field.h
+++ b/src/google/protobuf/repeated_field.h
@@ -616,14 +616,14 @@ inline void RepeatedField<Element>::Truncate(int new_size) {
template <typename Element>
inline void RepeatedField<Element>::MoveArray(
- Element to[], Element from[], int size) {
- memcpy(to, from, size * sizeof(Element));
+ Element to[], Element from[], int array_size) {
+ memcpy(to, from, array_size * sizeof(Element));
}
template <typename Element>
inline void RepeatedField<Element>::CopyArray(
- Element to[], const Element from[], int size) {
- memcpy(to, from, size * sizeof(Element));
+ Element to[], const Element from[], int array_size) {
+ memcpy(to, from, array_size * sizeof(Element));
}