salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename all protos to end with 'Proto' to avoid name conflicts.

Browse Source
This commit is contained in:
David Given
2021-05-13 18:05:08 +02:00
parent 639588fa68
commit 5a186b6960
37 changed files with 162 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/proto.cc
View File

@@ -38,7 +38,7 @@ static void test_setting(void)
static void test_config(void)
{
Config config;
ConfigProto config;
const std::string text = R"M(
input {
@@ -78,7 +78,7 @@ static void test_load(void)
static void test_range(void)
{
{
Range r;
RangeProto r;
r.set_start(0);
r.set_end(3);
r.add_also(5);
@@ -87,7 +87,7 @@ static void test_range(void)
}
{
Range r;
RangeProto r;
r.set_start(1);
r.set_end(1);
r.add_also(5);

10
tests/testproto.proto
View File

@@ -1,7 +1,7 @@
syntax = "proto2";
message TestProto {
message SubMessage {
message SubMessageProto {
optional string s = 1;
}
@@ -10,12 +10,12 @@ message TestProto {
optional uint64 u64 = 3;
optional uint32 u32 = 4;
optional double d = 5;
optional SubMessage m = 6;
repeated SubMessage r = 7;
optional SubMessageProto m = 6;
repeated SubMessageProto r = 7;
oneof alt {
SubMessage firstoption = 8;
SubMessage secondoption = 9;
SubMessageProto firstoption = 8;
SubMessageProto secondoption = 9;
}
}