diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-04-27 14:55:53 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-04-27 14:55:53 -0700 |
| commit | 9053033a5076f82cf18b823c31f352e95e5bfd8d (patch) | |
| tree | 1d2a2611f56e786d7c3e40b8fd1b2e3d9aff9025 /src/google/protobuf/compiler/mock_code_generator.cc | |
| parent | 067b1eec3bf852abaad0844999461baff8a5fdc8 (diff) | |
| parent | a6189acd18b00611c1dc7042299ad75486f08a1a (diff) | |
Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master
Diffstat (limited to 'src/google/protobuf/compiler/mock_code_generator.cc')
| -rw-r--r-- | src/google/protobuf/compiler/mock_code_generator.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/google/protobuf/compiler/mock_code_generator.cc b/src/google/protobuf/compiler/mock_code_generator.cc index a4b522ce..0ddb99e5 100644 --- a/src/google/protobuf/compiler/mock_code_generator.cc +++ b/src/google/protobuf/compiler/mock_code_generator.cc @@ -40,27 +40,21 @@ #endif #include <vector> +#include <google/protobuf/stubs/strutil.h> + #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> #include <google/protobuf/testing/file.h> #include <google/protobuf/testing/file.h> #include <google/protobuf/testing/file.h> +#include <google/protobuf/compiler/plugin.pb.h> #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> #include <google/protobuf/descriptor.pb.h> #include <google/protobuf/descriptor.h> -#include <google/protobuf/stubs/strutil.h> #include <google/protobuf/stubs/substitute.h> #include <gtest/gtest.h> -#ifdef major -#undef major -#endif -#ifdef minor -#undef minor -#endif -#include <google/protobuf/compiler/plugin.pb.h> - namespace google { namespace protobuf { namespace compiler { |