Skip to content

Commit 04d144c

Browse files
committed
Fix compatibility with protobuf v30 (#3034)
Partial backport of fixes from ##2966. Signed-off-by: Steve Peters <[email protected]> (cherry picked from commit 3f8d77b)
1 parent b90dd72 commit 04d144c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/systems/log/LogRecord.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ bool LogRecordPrivate::Start(const std::string &_logPath,
298298
if (!validSdfTopic.empty())
299299
{
300300
this->sdfPub = this->node.Advertise(validSdfTopic,
301-
this->sdfMsg.GetTypeName());
301+
std::string(this->sdfMsg.GetTypeName()));
302302
}
303303
else
304304
{

src/systems/triggered_publisher/TriggeredPublisher.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ void TriggeredPublisher::Configure(const Entity &,
582582
info.msgData = msgs::Factory::New(info.msgType, msgStr);
583583
if (nullptr != info.msgData)
584584
{
585-
info.pub =
586-
this->node.Advertise(info.topic, info.msgData->GetTypeName());
585+
info.pub = this->node.Advertise(info.topic,
586+
std::string(info.msgData->GetTypeName()));
587587
if (info.pub.Valid())
588588
{
589589
this->outputInfo.push_back(std::move(info));

0 commit comments

Comments
 (0)