summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-02-21 19:49:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-21 19:49:07 +0000
commit51ef8f39de376fe71ce5d2c682abe4f974cf8074 (patch)
tree629735fb54faae65062c4738769930b2685f8f09 /src
parentafc1553a9eb56eff742828c9c819eafa363cdcc9 (diff)
parentf03ad1a96ff9a713e26eccebad15c5ecd76ca911 (diff)
downloadexternal_protobuf-51ef8f39de376fe71ce5d2c682abe4f974cf8074.zip
external_protobuf-51ef8f39de376fe71ce5d2c682abe4f974cf8074.tar.gz
external_protobuf-51ef8f39de376fe71ce5d2c682abe4f974cf8074.tar.bz2
Merge "Fix compile error on mac 10.9"
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/message.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc
index 91e6878..0409a94 100644
--- a/src/google/protobuf/message.cc
+++ b/src/google/protobuf/message.cc
@@ -32,6 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
+#include <istream>
#include <stack>
#include <google/protobuf/stubs/hash.h>