diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 14:24:28 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 14:24:28 -0800 |
commit | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (patch) | |
tree | b050fe310f45756de0e4eeb120629581ecaa7455 /src/google/protobuf/repeated_field.h | |
parent | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (diff) | |
parent | af88ccb5fc6fcb1a4d6654cc3085cf269b646a96 (diff) |
Merge pull request #69 from apaprocki/aix-atomicops
Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
Diffstat (limited to 'src/google/protobuf/repeated_field.h')
-rw-r--r-- | src/google/protobuf/repeated_field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index c21ba97f..d5427e22 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -2075,11 +2075,11 @@ class RepeatedPtrIterator it_ += d; return *this; } - friend iterator operator+(iterator it, difference_type d) { + friend iterator operator+(iterator it, const difference_type d) { it += d; return it; } - friend iterator operator+(difference_type d, iterator it) { + friend iterator operator+(const difference_type d, iterator it) { it += d; return it; } |