diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-09-06 22:23:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-06 22:23:04 +0000 |
| commit | f9d6dcdae6bcbbcb4635f5377a82fd1a5ec17632 (patch) | |
| tree | 6691477cf8d2cf03f765d32f488e7dd02c0d0152 | |
| parent | 454e6cabe407b4ffc95f3ae8abf3b99573eca9d6 (diff) | |
| parent | 26c830a601a4be274c27401f2656b4faa0316b92 (diff) | |
| download | protobuf-f9d6dcdae6bcbbcb4635f5377a82fd1a5ec17632.tar.gz | |
Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46 am: 09de6a61c5
am: 26c830a601
Change-Id: I9fe6bef3484fe7bcf0a5fbf69327e09f743788d3
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 3a9d2639c..f91a1a6c3 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -1575,7 +1575,7 @@ GenerateClear(io::Printer* printer) { "#define ZR_(first, last) do { \\\n" " size_t f = OFFSET_OF_FIELD_(first); \\\n" " size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \\\n" - " ::memset(&first, 0, n); \\\n" + " ::memset(&(first), 0, n); \\\n" " } while (0)\n\n"; for (int i = 0; i < runs_of_fields_.size(); i++) { const vector<string>& run = runs_of_fields_[i]; diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 242e3c0d9..0bed03ef5 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1755,7 +1755,7 @@ void DescriptorProto_ExtensionRange::Clear() { #define ZR_(first, last) do { \ size_t f = OFFSET_OF_FIELD_(first); \ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ + ::memset(&(first), 0, n); \ } while (0) ZR_(start_, end_); @@ -4979,7 +4979,7 @@ void FileOptions::Clear() { #define ZR_(first, last) do { \ size_t f = OFFSET_OF_FIELD_(first); \ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ + ::memset(&(first), 0, n); \ } while (0) if (_has_bits_[0 / 32] & 255) { @@ -5726,7 +5726,7 @@ void MessageOptions::Clear() { #define ZR_(first, last) do { \ size_t f = OFFSET_OF_FIELD_(first); \ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ + ::memset(&(first), 0, n); \ } while (0) ZR_(message_set_wire_format_, deprecated_); @@ -6124,7 +6124,7 @@ void FieldOptions::Clear() { #define ZR_(first, last) do { \ size_t f = OFFSET_OF_FIELD_(first); \ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ + ::memset(&(first), 0, n); \ } while (0) if (_has_bits_[0 / 32] & 63) { @@ -6619,7 +6619,7 @@ void EnumOptions::Clear() { #define ZR_(first, last) do { \ size_t f = OFFSET_OF_FIELD_(first); \ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ + ::memset(&(first), 0, n); \ } while (0) ZR_(allow_alias_, deprecated_); @@ -8085,7 +8085,7 @@ void UninterpretedOption::Clear() { #define ZR_(first, last) do { \ size_t f = OFFSET_OF_FIELD_(first); \ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ + ::memset(&(first), 0, n); \ } while (0) if (_has_bits_[0 / 32] & 126) { |