Skip to content

Commit 82da364

Browse files
Use data() instead of begin() in Protocols.cpp (#33476)
* Use data() instead of begin() in Protocols.cpp The GetProtocolName() function tries to store the result of std::array<T>::begin() in a raw pointer type, but this no longer works on some newer versions of clang, since clang now returns an iterator object. This change fixes this by switching to std::array<T>::data() instead, which always returns a raw pointer. * Restyled by whitespace --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 7e88bf0 commit 82da364

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/protocols/Protocols.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,27 +86,27 @@ const char * GetMessageTypeName(Id protocolId, uint8_t msgType)
8686
switch (protocolId.GetProtocolId())
8787
{
8888
case InteractionModel::Id.GetProtocolId():
89-
lookupTable = MessageTypeTraits<InteractionModel::MsgType>::GetTypeToNameTable()->begin();
89+
lookupTable = MessageTypeTraits<InteractionModel::MsgType>::GetTypeToNameTable()->data();
9090
lookupTableSize = MessageTypeTraits<InteractionModel::MsgType>::GetTypeToNameTable()->size();
9191
break;
9292

9393
case SecureChannel::Id.GetProtocolId():
94-
lookupTable = MessageTypeTraits<SecureChannel::MsgType>::GetTypeToNameTable()->begin();
94+
lookupTable = MessageTypeTraits<SecureChannel::MsgType>::GetTypeToNameTable()->data();
9595
lookupTableSize = MessageTypeTraits<SecureChannel::MsgType>::GetTypeToNameTable()->size();
9696
break;
9797

9898
case BDX::Id.GetProtocolId():
99-
lookupTable = MessageTypeTraits<bdx::MessageType>::GetTypeToNameTable()->begin();
99+
lookupTable = MessageTypeTraits<bdx::MessageType>::GetTypeToNameTable()->data();
100100
lookupTableSize = MessageTypeTraits<bdx::MessageType>::GetTypeToNameTable()->size();
101101
break;
102102

103103
case Echo::Id.GetProtocolId():
104-
lookupTable = MessageTypeTraits<Echo::MsgType>::GetTypeToNameTable()->begin();
104+
lookupTable = MessageTypeTraits<Echo::MsgType>::GetTypeToNameTable()->data();
105105
lookupTableSize = MessageTypeTraits<Echo::MsgType>::GetTypeToNameTable()->size();
106106
break;
107107

108108
case UserDirectedCommissioning::Id.GetProtocolId():
109-
lookupTable = MessageTypeTraits<UserDirectedCommissioning::MsgType>::GetTypeToNameTable()->begin();
109+
lookupTable = MessageTypeTraits<UserDirectedCommissioning::MsgType>::GetTypeToNameTable()->data();
110110
lookupTableSize = MessageTypeTraits<UserDirectedCommissioning::MsgType>::GetTypeToNameTable()->size();
111111
break;
112112

0 commit comments

Comments
 (0)