Skip to content

Commit 36824f0

Browse files
bill997mergify[bot]
authored andcommitted
Fix compatibility with protobuf v30 (cpp 6.30.0) (#677)
Signed-off-by: bill ross <4451962+bill997@users.noreply.github.com> Co-authored-by: bill ross <4451962+bill997@users.noreply.github.com> Co-authored-by: Ian Chen <ichen@openrobotics.org> (cherry picked from commit e1eb227) # Conflicts: # src/plugins/topic_viewer/TopicViewer.cc
1 parent ab5af59 commit 36824f0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/plugins/topic_viewer/TopicViewer.cc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,17 @@ void TopicViewerPrivate::AddField(QStandardItem *_parentItem,
265265
auto messageType = msgField->message_type();
266266

267267
if (messageType)
268+
<<<<<<< HEAD
268269
this->AddField(msgItem, msgField->name(), messageType->name());
270+
=======
271+
this->AddField(msgItem, std::string(msgField->name()),
272+
std::string(messageType->full_name()));
273+
>>>>>>> e1eb227 (Fix compatibility with protobuf v30 (cpp 6.30.0) (#677))
269274

270275
else
271276
{
272-
auto msgFieldItem = this->FactoryItem(msgField->name(),
273-
msgField->type_name());
277+
auto msgFieldItem = this->FactoryItem(std::string(msgField->name()),
278+
std::string(msgField->type_name()));
274279
msgItem->appendRow(msgFieldItem);
275280

276281
this->SetItemPath(msgFieldItem);

0 commit comments

Comments
 (0)