Skip to content

Commit e27adfa

Browse files
committed
Merged in feature/PROTO-267-disable-field_number_to_name (pull request #186)
Added a complie flag around the field_number_to_name function such that it can be removed from the compile processes.
2 parents c74314c + ed4e6fc commit e27adfa

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
lines changed

generator/EmbeddedProto/templates/TypeDefMsg.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ class {{ typedef.get_name() }} final: public ::EmbeddedProto::MessageInterface
246246

247247
}
248248

249+
#ifndef DISABLE_FIELD_NUMBER_TO_NAME
250+
249251
static char const* field_number_to_name(const FieldNumber fieldNumber)
250252
{
251253
char const* name = nullptr;
@@ -270,6 +272,8 @@ class {{ typedef.get_name() }} final: public ::EmbeddedProto::MessageInterface
270272
return name;
271273
}
272274

275+
#endif
276+
273277
#ifdef MSG_TO_STRING
274278

275279
::EmbeddedProto::string_view to_string(::EmbeddedProto::string_view& str) const

test/test_SimpleTypes.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ TEST(SimpleTypes, deserialize_fault_overlong_varint)
542542
EXPECT_EQ(::EmbeddedProto::Error::OVERLONG_VARINT, msg.deserialize(buffer));
543543
}
544544

545+
#ifndef DISABLE_FIELD_NUMBER_TO_NAME
546+
545547
TEST(SimpleTypes, field_number_to_name)
546548
{
547549
EXPECT_TRUE(0 == strcmp(::Test_Simple_Types::field_number_to_name(::Test_Simple_Types::FieldNumber::A_INT32),
@@ -557,6 +559,8 @@ TEST(SimpleTypes, field_number_to_name)
557559
"Invalid FieldNumber"));
558560
}
559561

562+
#endif
563+
560564
#ifdef MSG_TO_STRING
561565

562566
TEST(SimpleTypes, to_string)

test/test_oneof_fields.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,9 @@ TEST(OneofField, sb_oneof_serialize_empty)
441441

442442
}
443443

444+
445+
#ifndef DISABLE_FIELD_NUMBER_TO_NAME
446+
444447
TEST(OneofField, field_number_to_name)
445448
{
446449
EXPECT_TRUE(0 == strcmp(::message_oneof::field_number_to_name(::message_oneof::FieldNumber::X),
@@ -453,6 +456,8 @@ TEST(OneofField, field_number_to_name)
453456
"msg_ABC"));
454457
}
455458

459+
#endif
460+
456461

457462
#ifdef MSG_TO_STRING
458463

test/test_string_bytes.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,8 @@ TEST(RepeatedStringBytes, deserialize)
785785
EXPECT_STREQ(msg.array_of_txt(2).get_const(), "Foo bar 3");
786786
}
787787

788+
#ifndef DISABLE_FIELD_NUMBER_TO_NAME
789+
788790
TEST(RepeatedStringBytes, field_number_to_name)
789791
{
790792
using RSB = repeated_string_bytes<3, 15, 3, 15, 3, 3>;
@@ -797,6 +799,8 @@ TEST(RepeatedStringBytes, field_number_to_name)
797799
"nested_bytes"));
798800
}
799801

802+
#endif
803+
800804
#ifdef MSG_TO_STRING
801805

802806
TEST(RepeatedStringBytes, to_string)

0 commit comments

Comments
 (0)