diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
| commit | 0400cca3236de1ca303af38bf81eab332d042b7c (patch) | |
| tree | a8a9b19853f64567c96750a1c7d253926471daa5 /src/google/protobuf/compiler/java/java_message_builder.cc | |
| parent | 96b535cc2f4f7b7e22a1b8622149f7c26a5a3f63 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/compiler/java/java_message_builder.cc')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_message_builder.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/java/java_message_builder.cc b/src/google/protobuf/compiler/java/java_message_builder.cc index 43c39b4a..4c67e806 100644 --- a/src/google/protobuf/compiler/java/java_message_builder.cc +++ b/src/google/protobuf/compiler/java/java_message_builder.cc @@ -38,9 +38,6 @@ #include <google/protobuf/stubs/hash.h> #include <map> #include <memory> -#ifndef _SHARED_PTR_H -#include <google/protobuf/stubs/shared_ptr.h> -#endif #include <vector> #include <google/protobuf/compiler/java/java_context.h> @@ -50,9 +47,9 @@ #include <google/protobuf/compiler/java/java_generator_factory.h> #include <google/protobuf/compiler/java/java_helpers.h> #include <google/protobuf/compiler/java/java_name_resolver.h> +#include <google/protobuf/descriptor.pb.h> #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/io/printer.h> -#include <google/protobuf/descriptor.pb.h> #include <google/protobuf/wire_format.h> #include <google/protobuf/stubs/substitute.h> #include <google/protobuf/stubs/strutil.h> |