diff options
| author | Scott James Remnant <keybuk@google.com> | 2022-03-30 18:27:03 -0700 |
|---|---|---|
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-03-31 21:15:21 +0000 |
| commit | 25a7e53e7e7a7ac9413321b3aff9c69a484f363b (patch) | |
| tree | 28f7ff4caf00eb1ac6374236120e82d878adaf61 | |
| parent | b7ed839321e377847aa4a9d1842d5c25409631b5 (diff) | |
| download | pigweed-25a7e53e7e7a7ac9413321b3aff9c69a484f363b.tar.gz | |
pw_protobuf: Rename test proto 'int' field
Rename 'int' to 'integer' to avoid a conflict with C++ keywords after
performing code generation.
Change-Id: Iecf3166da6d472082fcc4e267fb60d576ac0e3db
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/89421
Pigweed-Auto-Submit: Scott James Remnant <keybuk@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Scott James Remnant <keybuk@google.com>
| -rw-r--r-- | pw_protobuf/codegen_encoder_test.cc | 2 | ||||
| -rw-r--r-- | pw_protobuf/pw_protobuf_test_protos/proto2.proto | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pw_protobuf/codegen_encoder_test.cc b/pw_protobuf/codegen_encoder_test.cc index 673213d88..93bb02db3 100644 --- a/pw_protobuf/codegen_encoder_test.cc +++ b/pw_protobuf/codegen_encoder_test.cc @@ -428,7 +428,7 @@ TEST(Codegen, Proto2) { std::byte encode_buffer[64]; Foo::MemoryEncoder foo(encode_buffer); - foo.WriteInt(3).IgnoreError(); // TODO(pwbug/387): Handle Status properly + foo.WriteInteger(3).IgnoreError(); // TODO(pwbug/387): Handle Status properly { constexpr std::byte data[] = { diff --git a/pw_protobuf/pw_protobuf_test_protos/proto2.proto b/pw_protobuf/pw_protobuf_test_protos/proto2.proto index c8d9e8e08..58d9a87d4 100644 --- a/pw_protobuf/pw_protobuf_test_protos/proto2.proto +++ b/pw_protobuf/pw_protobuf_test_protos/proto2.proto @@ -16,7 +16,7 @@ syntax = "proto2"; package pw.protobuf.test; message Foo { - required uint32 int = 1; + required uint32 integer = 1; optional string str = 2; repeated Bar bar = 3; optional pb pb = 4; |