F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-vector-routing: Use if constexpr () instead of RunIf

Browse Source 
Since ns-3 supports C++17 constructs now, we can make use
of `if constexpr` as it evaluates the condition inside it
only for that instantiation (distinction happens at compile
time itself).

Signed-off-by: Ameya Deshpande <ameyanrd@outlook.com>
This commit is contained in:
Ameya Deshpande
2021-09-21 15:06:49 +00:00
committed by Tommaso Pecorella
parent 5f4063d133
commit 9876391c6d
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nix-vector-routing/model/nix-vector-routing.cc
View File

@@ -34,17 +34,6 @@
#include "nix-vector-routing.h"
/* RunIf code is a candidate for ns-3 core module */
template <class F, class...Ts>
void RunIf (std::true_type, F&& f, Ts&&... ts )
{
f (std::forward<Ts>(ts)...);
}
template <class...Xs>
void RunIf (std::false_type, Xs&&...)
{
}
namespace ns3 {
NS_LOG_COMPONENT_DEFINE ("NixVectorRouting");
@@ -417,19 +406,12 @@ NixVectorRouting<T>::GetAdjacentNetDevices (Ptr<NetDevice> netDevice, Ptr<Channe
for (uint32_t j = 0; j < netDeviceAddresses; ++j)
{
IpInterfaceAddress netDeviceIfAddr = netDeviceInterface->GetAddress (j);
bool isNetDeviceAddrLinkLocal = false;
RunIf (std::is_same<Ipv6RoutingProtocol,T>{}, [&](Ipv6InterfaceAddress IfAddr, bool &isNetDeviceAddrLinkLocal)
if constexpr (!IsIpv4::value)
{
if (IfAddr.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
if (netDeviceIfAddr.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
{
isNetDeviceAddrLinkLocal = true;
continue;
}
},
netDeviceIfAddr, isNetDeviceAddrLinkLocal);
if (isNetDeviceAddrLinkLocal)
{
continue;
}
for (uint32_t k = 0; k < remoteDeviceAddresses; ++k)
{