diff --git a/libuavcan/include/uavcan/transport/transfer.hpp b/libuavcan/include/uavcan/transport/transfer.hpp index bf92ca9a79..015c43115c 100644 --- a/libuavcan/include/uavcan/transport/transfer.hpp +++ b/libuavcan/include/uavcan/transport/transfer.hpp @@ -60,7 +60,7 @@ public: /** * Amount of increment() calls to reach rhs value. */ - int forwardDistance(TransferID rhs) const; + int computeForwardDistance(TransferID rhs) const; }; diff --git a/libuavcan/src/transport/transfer.cpp b/libuavcan/src/transport/transfer.cpp index ab63068340..0fa81ad180 100644 --- a/libuavcan/src/transport/transfer.cpp +++ b/libuavcan/src/transport/transfer.cpp @@ -18,7 +18,7 @@ const NodeID NodeID::Broadcast(ValueBroadcast); /** * TransferID */ -int TransferID::forwardDistance(TransferID rhs) const +int TransferID::computeForwardDistance(TransferID rhs) const { int d = int(rhs.get()) - int(get()); if (d < 0) diff --git a/libuavcan/src/transport/transfer_receiver.cpp b/libuavcan/src/transport/transfer_receiver.cpp index c02bdc28e5..1f81934a3a 100644 --- a/libuavcan/src/transport/transfer_receiver.cpp +++ b/libuavcan/src/transport/transfer_receiver.cpp @@ -19,7 +19,7 @@ const uint32_t TransferReceiver::MaxTransferIntervalUSec; TransferReceiver::TidRelation TransferReceiver::getTidRelation(const RxFrame& frame) const { - const int distance = tid_.forwardDistance(frame.getTransferID()); + const int distance = tid_.computeForwardDistance(frame.getTransferID()); if (distance == 0) return TidSame; if (distance < ((1 << TransferID::BitLen) / 2)) diff --git a/libuavcan/test/transport/transfer.cpp b/libuavcan/test/transport/transfer.cpp index b6458465f7..32a8d4e872 100644 --- a/libuavcan/test/transport/transfer.cpp +++ b/libuavcan/test/transport/transfer.cpp @@ -17,16 +17,16 @@ TEST(Transfer, TransferID) /* * forwardDistance() */ - EXPECT_EQ(0, TransferID(0).forwardDistance(0)); - EXPECT_EQ(1, TransferID(0).forwardDistance(1)); - EXPECT_EQ(7, TransferID(0).forwardDistance(7)); + EXPECT_EQ(0, TransferID(0).computeForwardDistance(0)); + EXPECT_EQ(1, TransferID(0).computeForwardDistance(1)); + EXPECT_EQ(7, TransferID(0).computeForwardDistance(7)); - EXPECT_EQ(0, TransferID(7).forwardDistance(7)); - EXPECT_EQ(7, TransferID(7).forwardDistance(6)); - EXPECT_EQ(1, TransferID(7).forwardDistance(0)); + EXPECT_EQ(0, TransferID(7).computeForwardDistance(7)); + EXPECT_EQ(7, TransferID(7).computeForwardDistance(6)); + EXPECT_EQ(1, TransferID(7).computeForwardDistance(0)); - EXPECT_EQ(7, TransferID(7).forwardDistance(6)); - EXPECT_EQ(5, TransferID(0).forwardDistance(5)); + EXPECT_EQ(7, TransferID(7).computeForwardDistance(6)); + EXPECT_EQ(5, TransferID(0).computeForwardDistance(5)); /* * Misc @@ -42,8 +42,8 @@ TEST(Transfer, TransferID) ASSERT_EQ(i & ((1 << TransferID::BitLen) - 1), tid.get()); const TransferID copy = tid; tid.increment(); - ASSERT_EQ(1, copy.forwardDistance(tid)); - ASSERT_EQ(7, tid.forwardDistance(copy)); - ASSERT_EQ(0, tid.forwardDistance(tid)); + ASSERT_EQ(1, copy.computeForwardDistance(tid)); + ASSERT_EQ(7, tid.computeForwardDistance(copy)); + ASSERT_EQ(0, tid.computeForwardDistance(tid)); } }