diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-09-12 10:32:01 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-09-14 10:03:57 -0700 |
| commit | 13fd045dbb2b4dacea32be162a41d5a4b0d1802f (patch) | |
| tree | c219e7eb18b82523e36c6748861c403a14ea66ae /src/google/protobuf/compiler/plugin.cc | |
| parent | d1bc27caef8377a710370189675cb0958443e8f1 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/compiler/plugin.cc')
| -rw-r--r-- | src/google/protobuf/compiler/plugin.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/plugin.cc b/src/google/protobuf/compiler/plugin.cc index cb5e37bb..7f975510 100644 --- a/src/google/protobuf/compiler/plugin.cc +++ b/src/google/protobuf/compiler/plugin.cc @@ -41,13 +41,18 @@ #include <unistd.h> #endif -#include <google/protobuf/stubs/io_win32.h> #include <google/protobuf/stubs/logging.h> #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/stubs/io_win32.h> + + +namespace google { +namespace protobuf { +namespace compiler { #if defined(_MSC_VER) // DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import @@ -55,10 +60,6 @@ using google::protobuf::internal::win32::setmode; #endif -namespace google { -namespace protobuf { -namespace compiler { - class GeneratorResponseContext : public GeneratorContext { public: GeneratorResponseContext( |