diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2017-07-25 12:00:29 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-25 12:00:29 -0700 |
commit | f39d4de94f5c8a5cd60b5663bd25f4d10614f028 (patch) | |
tree | 70c7cbb704a710ede1a069ae8584c902afc8aae2 /src | |
parent | 759245a49a00315a41b28da8fe52a2894d4f57ea (diff) | |
parent | bb8664419b7d0dd4a94cc1242a2d77bf5e8f567b (diff) | |
download | protobuf-f39d4de94f5c8a5cd60b5663bd25f4d10614f028.tar.gz protobuf-f39d4de94f5c8a5cd60b5663bd25f4d10614f028.tar.bz2 protobuf-f39d4de94f5c8a5cd60b5663bd25f4d10614f028.zip |
Merge remote-tracking branch 'origin/master' into merge
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/compiler/code_generator.h | 4 | ||||
-rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/code_generator.h b/src/google/protobuf/compiler/code_generator.h index 8b9f42e2..dd6a59d8 100644 --- a/src/google/protobuf/compiler/code_generator.h +++ b/src/google/protobuf/compiler/code_generator.h @@ -165,8 +165,8 @@ typedef GeneratorContext OutputDirectory; // "foo=bar,baz,qux=corge" // parses to the pairs: // ("foo", "bar"), ("baz", ""), ("qux", "corge") -LIBPROTOC_EXPORT void ParseGeneratorParameter(const string&, - std::vector<std::pair<string, string> >*); +LIBPROTOC_EXPORT void ParseGeneratorParameter( + const string&, std::vector<std::pair<string, string> >*); } // namespace compiler } // namespace protobuf diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 2b0b641e..64cdbcd2 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -63,6 +63,7 @@ #include <gtest/gtest.h> #include <google/protobuf/stubs/strutil.h> +#include <google/protobuf/stubs/io_win32.h> namespace google { namespace protobuf { |