third_party/protobuf/src/google/protobuf/compiler/subprocess.cc - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/subprocess.cc

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc ('k') | third_party/protobuf/src/google/protobuf/descriptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/subprocess.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc b/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc

index a30ac305199ebbee5ef91bb160c30751713d759b..6e2586641255d983e5d4b0a7a90d4a1760fbb7a0 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc

@@ -361,7 +361,7 @@ bool Subprocess::Communicate(const Message& input, Message* output,

string output_data;

int input_pos = 0;

- int max_fd = max(child_stdin_, child_stdout_);

+ int max_fd = std::max(child_stdin_, child_stdout_);

while (child_stdout_ != -1) {

fd_set read_fds;