ns-3.41 compatibility

signetlabdei · Mar 19, 2024 · 5729c20 · 5729c20
1 parent 6babcbe
commit 5729c20
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/NS3-VERSION b/NS3-VERSION
@@ -1 +1 @@
-release ns-3.40
+release ns-3.41
diff --git a/model/adr-component.cc b/model/adr-component.cc
@@ -43,7 +43,7 @@ AdrComponent::GetTypeId()
             .AddAttribute("MultipleGwCombiningMethod",
                           "Whether to average the received power of gateways or to use the maximum",
                           EnumValue(AdrComponent::AVERAGE),
-                          MakeEnumAccessor(&AdrComponent::tpAveraging),
+                          MakeEnumAccessor<CombiningMethod>(&AdrComponent::tpAveraging),
                           MakeEnumChecker(AdrComponent::AVERAGE,
                                           "avg",
                                           AdrComponent::MAXIMUM,
@@ -53,7 +53,7 @@ AdrComponent::GetTypeId()
             .AddAttribute("MultiplePacketsCombiningMethod",
                           "Whether to average SNRs from multiple packets or to use the maximum",
                           EnumValue(AdrComponent::AVERAGE),
-                          MakeEnumAccessor(&AdrComponent::historyAveraging),
+                          MakeEnumAccessor<CombiningMethod>(&AdrComponent::historyAveraging),
                           MakeEnumChecker(AdrComponent::AVERAGE,
                                           "avg",
                                           AdrComponent::MAXIMUM,

diff --git a/model/end-device-lorawan-mac.cc b/model/end-device-lorawan-mac.cc
@@ -98,7 +98,7 @@ EndDeviceLorawanMac::GetTypeId()
             .AddAttribute("MType",
                           "Specify type of message will be sent by this ED.",
                           EnumValue(LorawanMacHeader::UNCONFIRMED_DATA_UP),
-                          MakeEnumAccessor(&EndDeviceLorawanMac::m_mType),
+                          MakeEnumAccessor<LorawanMacHeader::MType>(&EndDeviceLorawanMac::m_mType),
                           MakeEnumChecker(LorawanMacHeader::UNCONFIRMED_DATA_UP,
                                           "Unconfirmed",
                                           LorawanMacHeader::CONFIRMED_DATA_UP,