Skip to content

Commit 874ca44

Browse files
committed
ESP8266WiFiMesh - fix classes used as aggregates
> error: designated initializers cannot be used with a non-aggregate type '...' gcc10.3 allowed this construct for some reason
1 parent 658ba46 commit 874ca44

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ void ESP8266WiFiMesh::attemptTransmission(const String &message, bool concluding
535535
if(WiFi.status() == WL_CONNECTED)
536536
{
537537
transmission_status_t transmissionResult = attemptDataTransfer();
538-
latestTransmissionOutcomes.push_back(TransmissionResult(connectionQueue.back(), transmissionResult));
538+
latestTransmissionOutcomes.emplace_back(connectionQueue.back(), transmissionResult);
539539
}
540540
else
541541
{
@@ -600,7 +600,7 @@ void ESP8266WiFiMesh::attemptTransmission(const String &message, bool concluding
600600

601601
transmission_status_t transmissionResult = connectToNode(currentSSID, currentWiFiChannel, currentBSSID);
602602

603-
latestTransmissionOutcomes.push_back(TransmissionResult{.origin = currentNetwork, .transmissionStatus = transmissionResult});
603+
latestTransmissionOutcomes.emplace_back(currentNetwork, transmissionResult);
604604
}
605605
}
606606

libraries/ESP8266WiFiMesh/src/EspnowMeshBackend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ void EspnowMeshBackend::attemptTransmission(const String &message, const bool sc
826826
{
827827
TransmissionStatusType transmissionResult = initiateTransmission(getMessage(), currentNetwork);
828828

829-
latestTransmissionOutcomes().push_back(TransmissionOutcome{.origin = currentNetwork, .transmissionStatus = transmissionResult});
829+
latestTransmissionOutcomes().emplace_back(currentNetwork, transmissionResult);
830830

831831
if(!getTransmissionOutcomesUpdateHook()(*this))
832832
break;
@@ -897,7 +897,7 @@ void EspnowMeshBackend::attemptAutoEncryptingTransmission(const String &message,
897897

898898
TransmissionStatusType transmissionResult = initiateAutoEncryptingTransmission(getMessage(), currentBSSID, connectionStatus);
899899

900-
latestTransmissionOutcomes().push_back(TransmissionOutcome{.origin = currentNetwork, .transmissionStatus = transmissionResult});
900+
latestTransmissionOutcomes().emplace_back(currentNetwork, transmissionResult);
901901

902902
_encryptionBroker.finalizeAutoEncryptingConnection(currentBSSID, existingEncryptedConnection, requestPermanentConnections);
903903

libraries/ESP8266WiFiMesh/src/TcpIpMeshBackend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ void TcpIpMeshBackend::attemptTransmission(const String &message, const bool sca
451451
if(WiFi.status() == WL_CONNECTED)
452452
{
453453
TransmissionStatusType transmissionResult = attemptDataTransfer();
454-
latestTransmissionOutcomes().push_back(TransmissionOutcome(constConnectionQueue().back(), transmissionResult));
454+
latestTransmissionOutcomes().emplace_back(constConnectionQueue().back(), transmissionResult);
455455

456456
getTransmissionOutcomesUpdateHook()(*this);
457457
}
@@ -474,7 +474,7 @@ void TcpIpMeshBackend::attemptTransmission(const String &message, const bool sca
474474
{
475475
TransmissionStatusType transmissionResult = initiateTransmission(currentNetwork);
476476

477-
latestTransmissionOutcomes().push_back(TransmissionOutcome{.origin = currentNetwork, .transmissionStatus = transmissionResult});
477+
latestTransmissionOutcomes().emplace_back(currentNetwork, transmissionResult);
478478

479479
if(!getTransmissionOutcomesUpdateHook()(*this))
480480
break;

0 commit comments

Comments
 (0)