diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-17 18:15:40 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-17 18:15:40 -0800 |
| commit | 53c1029362a18c1a893d99e8d3145966a67d9731 (patch) | |
| tree | e4bf47271f48ed70bd954a084284acbe28db649a /src/google/protobuf/compiler | |
| parent | f157a5651c79a7a36e242af216a5d5b383ba8af2 (diff) | |
| parent | 8b2aafe7d3f59463fb8693421c09bfefb3bd0104 (diff) | |
Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MIN
Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
Diffstat (limited to 'src/google/protobuf/compiler')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_enum.cc | 4 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_file.cc | 1 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/plugin.pb.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_enum.cc b/src/google/protobuf/compiler/cpp/cpp_enum.cc index 32d5516e..3ce1f120 100644 --- a/src/google/protobuf/compiler/cpp/cpp_enum.cc +++ b/src/google/protobuf/compiler/cpp/cpp_enum.cc @@ -106,8 +106,8 @@ void EnumGenerator::GenerateDefinition(io::Printer* printer) { // INT32_MIN and INT32_MAX if (descriptor_->value_count() > 0) printer->Print(",\n"); printer->Print(vars, - "$classname$_$prefix$INT_MIN_SENTINEL_DO_NOT_USE_ = INT32_MIN,\n" - "$classname$_$prefix$INT_MAX_SENTINEL_DO_NOT_USE_ = INT32_MAX"); + "$classname$_$prefix$INT_MIN_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32min,\n" + "$classname$_$prefix$INT_MAX_SENTINEL_DO_NOT_USE_ = ::google::protobuf::kint32max"); } printer->Outdent(); diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index 8745577f..fae4df40 100644 --- a/src/google/protobuf/compiler/cpp/cpp_file.cc +++ b/src/google/protobuf/compiler/cpp/cpp_file.cc @@ -105,7 +105,6 @@ void FileGenerator::GenerateHeader(io::Printer* printer) { "#define PROTOBUF_$filename_identifier$__INCLUDED\n" "\n" "#include <string>\n" - "#include <stdint.h>\n" // INT32_MIN, INT32_MAX "\n", "filename", file_->name(), "filename_identifier", filename_identifier); diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 581fccf0..35a0a899 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -5,7 +5,6 @@ #define PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto__INCLUDED #include <string> -#include <stdint.h> #include <google/protobuf/stubs/common.h> |