diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
| commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
| tree | 16c54ef8d5409766c18ccae8fca685230680d620 /src/google/protobuf/compiler/plugin.cc | |
| parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
| parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) | |
| download | protobuf-ed4321d1cb33199984118d801956822842771e7e.tar.gz protobuf-ed4321d1cb33199984118d801956822842771e7e.tar.bz2 protobuf-ed4321d1cb33199984118d801956822842771e7e.zip | |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/compiler/plugin.cc')
| -rw-r--r-- | src/google/protobuf/compiler/plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/plugin.cc b/src/google/protobuf/compiler/plugin.cc index bde3d798..9c1c757c 100644 --- a/src/google/protobuf/compiler/plugin.cc +++ b/src/google/protobuf/compiler/plugin.cc @@ -45,8 +45,8 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/compiler/plugin.pb.h> #include <google/protobuf/compiler/code_generator.h> -#include <google/protobuf/descriptor.h> #include <google/protobuf/io/zero_copy_stream_impl.h> +#include <google/protobuf/descriptor.h> #include <google/protobuf/stubs/io_win32.h> |