From 75e4c446a30d89b43eb043c8ef4a421c77fc1b95 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 1 Jun 2020 16:35:52 -0700 Subject: [PATCH 1/2] Added changelog entries for Piper sync. --- CHANGES.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 43be322ca2..253e47b4c8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,10 +1,15 @@ Unreleased Changes C++: + * Removed deprecated unsafe arena string accessors * Enabled heterogeneous lookup for std::string keys in maps. * Improved the randomness of map ordering. + * Removed implicit conversion from StringPiece to std::string + * Fix use-after-destroy bug when the Map is allocated in the arena. + * Improved the randomness of proto map ordering Python: + * Reject lowercase t for Timestamp json format. Fixes a conformance test. * Improved the error message when AttributeError is returned from __getattr__ in EnumTypeWrapper. From 8d93bc1826e956ae553b6f569f64c3b9906a9791 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 1 Jun 2020 16:56:18 -0700 Subject: [PATCH 2/2] Normalized formatting of macros. It's a bit unforuntate to lose the nesting, but that's what clang-format is telling us here. --- src/google/protobuf/port_def.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index c92a3d5045..4359bd2f48 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -356,8 +356,8 @@ #endif #if defined(PROTOBUF_USE_DLLS) - #if defined(_MSC_VER) - #ifdef LIBPROTOBUF_EXPORTS +#if defined(_MSC_VER) +#ifdef LIBPROTOBUF_EXPORTS #define PROTOBUF_EXPORT __declspec(dllexport) #define PROTOBUF_EXPORT_TEMPLATE_DECLARE #define PROTOBUF_EXPORT_TEMPLATE_DEFINE __declspec(dllexport) @@ -388,8 +388,8 @@ #endif #endif #else // defined(PROTOBUF_USE_DLLS) - #define PROTOBUF_EXPORT - #define PROTOC_EXPORT +#define PROTOBUF_EXPORT +#define PROTOC_EXPORT #define PROTOBUF_EXPORT_TEMPLATE_DECLARE #define PROTOBUF_EXPORT_TEMPLATE_DEFINE #endif