diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-02-01 20:35:34 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-02-01 20:35:34 +0000 |
| commit | c65c04195de5d861f3802ac380547244a16220d2 (patch) | |
| tree | b10f54a7024c6d11d4dd4c6e5a92990f37ae6afa | |
| parent | daee05168eb0f2cf102b7ef80c0af87c80729612 (diff) | |
| download | protobuf-c65c04195de5d861f3802ac380547244a16220d2.tar.gz protobuf-c65c04195de5d861f3802ac380547244a16220d2.tar.bz2 protobuf-c65c04195de5d861f3802ac380547244a16220d2.zip | |
Fix issue 162: generated code should #include <algorithm> for std::swap().
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_file.cc | 4 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/plugin.pb.cc | 3 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index 80da7e40..e31cb425 100644 --- a/src/google/protobuf/compiler/cpp/cpp_file.cc +++ b/src/google/protobuf/compiler/cpp/cpp_file.cc @@ -287,7 +287,9 @@ void FileGenerator::GenerateSource(io::Printer* printer) { // want the compiler to warn in generated code. "#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION\n" "#include \"$basename$.pb.h\"\n" - + "\n" + "#include <algorithm>\n" // for swap() + "\n" "#include <google/protobuf/stubs/once.h>\n" "#include <google/protobuf/io/coded_stream.h>\n" "#include <google/protobuf/wire_format_lite_inl.h>\n", diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 6b0dd55a..13d35c68 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -2,6 +2,9 @@ #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #include "google/protobuf/compiler/plugin.pb.h" + +#include <algorithm> + #include <google/protobuf/stubs/once.h> #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/wire_format_lite_inl.h> diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index f61e7cd0..922237f5 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -2,6 +2,9 @@ #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #include "google/protobuf/descriptor.pb.h" + +#include <algorithm> + #include <google/protobuf/stubs/once.h> #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/wire_format_lite_inl.h> |