organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #3023 from acozzette/min

Browse source 
Fully qualify min as std::min in wire_format_lite.cc
This commit is contained in:
Adam Cozzette 2017-04-27 13:56:27 -07:00 • committed by GitHub
commit 067b1eec3b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/wire_format_lite.cc
View file

@ -378,7 +378,7 @@ static void WriteArray(const CType* a, int n, io::CodedOutputStream* output) {
const int kAtATime = 128;
uint8 buf[sizeof(CType) * kAtATime];
for (int i = 0; i < n; i += kAtATime) {
int to_do = min(kAtATime, n - i);
int to_do = std::min(kAtATime, n - i);
uint8* ptr = buf;
for (int j = 0; j < to_do; j++) {
EncodeFixedSizeValue(a[i+j], ptr);