diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-04-01 16:46:49 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-01 16:46:49 -0700 |
| commit | cba75ad40431ca0825aa59df3c9265a12c0ae3b6 (patch) | |
| tree | f7ce45e0922c46eecd01a36afb6d8ec5a71c8155 /src | |
| parent | 89343d87c6a335be561fd17c8e40c72901d2f152 (diff) | |
| parent | 452e2b2c5c607ab5d63cd813793f1aa960f19d1c (diff) | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/stubs/int128.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/int128.cc b/src/google/protobuf/stubs/int128.cc index d80c64f2..3a36b4b1 100644 --- a/src/google/protobuf/stubs/int128.cc +++ b/src/google/protobuf/stubs/int128.cc @@ -31,7 +31,7 @@ #include <google/protobuf/stubs/int128.h> #include <iomanip> -#include <iostream> // NOLINT(readability/streams) +#include <ostream> // NOLINT(readability/streams) #include <sstream> namespace google { |