From 952cf14442bf9cc6588d374399d453f1cff696a0 Mon Sep 17 00:00:00 2001 From: Kenneth Lum Date: Mon, 3 May 2021 11:21:59 -0700 Subject: [PATCH 1/2] fix typo (#8548) --- js/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/README.md b/js/README.md index 3635028fd5..2f5490b108 100644 --- a/js/README.md +++ b/js/README.md @@ -95,7 +95,7 @@ statements like: var message = proto.my.package.MyMessage(); -If unfamiliar with Closure or it's compiler, consider reviewing Closure documentation +If unfamiliar with Closure or its compiler, consider reviewing Closure documentation https://developers.google.com/closure/library/docs/tutorial https://developers.google.com/closure/library/docs/closurebuilder https://developers.google.com/closure/library/docs/depswriter From 28101c3e39408c04e4d959ccd9cdf1f4dbd5e012 Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Tue, 4 May 2021 03:05:02 +0500 Subject: [PATCH 2/2] Stop using GG_ prefixed macros (#8539) * Stop using GG_ prefixed macros GG_ULONGLONG was renamed to PROTOBUF_ULONGLONG some time ago * Better --- src/google/protobuf/compiler/cpp/cpp_helpers.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/cpp_helpers.cc b/src/google/protobuf/compiler/cpp/cpp_helpers.cc index fbca72c412..78c3b60f70 100644 --- a/src/google/protobuf/compiler/cpp/cpp_helpers.cc +++ b/src/google/protobuf/compiler/cpp/cpp_helpers.cc @@ -662,14 +662,7 @@ std::string UInt64ToString(const std::string& macro_prefix, uint64_t number) { } std::string DefaultValue(const FieldDescriptor* field) { - switch (field->cpp_type()) { - case FieldDescriptor::CPPTYPE_INT64: - return Int64ToString("GG", field->default_value_int64()); - case FieldDescriptor::CPPTYPE_UINT64: - return UInt64ToString("GG", field->default_value_uint64()); - default: - return DefaultValue(Options(), field); - } + return DefaultValue(Options(), field); } std::string DefaultValue(const Options& options, const FieldDescriptor* field) {