diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-09-07 16:15:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 16:15:38 -0700 |
| commit | f9d8138376765d229a32635c9209061e4e4aed8c (patch) | |
| tree | 50719686fd7262f405c9bda8694d6c72e7c038b8 /src/google/protobuf/implicit_weak_message.cc | |
| parent | 2e7563f40ec7f901ae8ae1cc749d701fa07e211d (diff) | |
| parent | e53be9bce4556cf0d13e24f1a25a7d75f663144f (diff) | |
| download | protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.gz protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.bz2 protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.zip | |
Merge pull request #5109 from haberman/integrate
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/implicit_weak_message.cc')
| -rw-r--r-- | src/google/protobuf/implicit_weak_message.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/implicit_weak_message.cc b/src/google/protobuf/implicit_weak_message.cc index 7e47cdcc..582d7084 100644 --- a/src/google/protobuf/implicit_weak_message.cc +++ b/src/google/protobuf/implicit_weak_message.cc @@ -31,11 +31,13 @@ #include <google/protobuf/implicit_weak_message.h> #include <google/protobuf/io/zero_copy_stream_impl_lite.h> +#include <google/protobuf/stubs/once.h> +#include <google/protobuf/wire_format_lite.h> + +#include <google/protobuf/port_def.inc> #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER #include <google/protobuf/parse_context.h> #endif -#include <google/protobuf/stubs/once.h> -#include <google/protobuf/wire_format_lite.h> namespace google { namespace protobuf { |