From fb0f44c4b47b2a2e353105aa0ce099fe1323550e Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Wed, 5 Feb 2014 01:21:53 +0400 Subject: [PATCH] Renamed AssertDynamicallyAllocatable --> IsDynamicallyAllocatable --- libuavcan/include/uavcan/internal/impl_constants.hpp | 2 +- libuavcan/include/uavcan/internal/transport/can_io.hpp | 2 +- .../include/uavcan/internal/transport/transfer_id_registry.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libuavcan/include/uavcan/internal/impl_constants.hpp b/libuavcan/include/uavcan/internal/impl_constants.hpp index d198fe5b90..33fe223360 100644 --- a/libuavcan/include/uavcan/internal/impl_constants.hpp +++ b/libuavcan/include/uavcan/internal/impl_constants.hpp @@ -25,7 +25,7 @@ enum { MEM_POOL_ALIGNMENT = 8 }; typedef char _alignment_check_for_MEM_POOL_BLOCK_SIZE[((MEM_POOL_BLOCK_SIZE & (MEM_POOL_ALIGNMENT - 1)) == 0) ? 1 : -1]; template -struct AssertDynamicallyAllocatable +struct IsDynamicallyAllocatable { static void check() { StaticAssert::check(); } }; diff --git a/libuavcan/include/uavcan/internal/transport/can_io.hpp b/libuavcan/include/uavcan/internal/transport/can_io.hpp index 353bced9d4..a9dfd613bc 100644 --- a/libuavcan/include/uavcan/internal/transport/can_io.hpp +++ b/libuavcan/include/uavcan/internal/transport/can_io.hpp @@ -45,7 +45,7 @@ public: , qos(uint8_t(qos)) { assert(qos == VOLATILE || qos == PERSISTENT); - AssertDynamicallyAllocatable::check(); + IsDynamicallyAllocatable::check(); } bool isExpired(uint64_t monotonic_timestamp) const { return monotonic_timestamp > monotonic_deadline; } diff --git a/libuavcan/include/uavcan/internal/transport/transfer_id_registry.hpp b/libuavcan/include/uavcan/internal/transport/transfer_id_registry.hpp index d621b12faf..c897fbc88f 100644 --- a/libuavcan/include/uavcan/internal/transport/transfer_id_registry.hpp +++ b/libuavcan/include/uavcan/internal/transport/transfer_id_registry.hpp @@ -87,7 +87,7 @@ private: StorageEntryGroup() { - AssertDynamicallyAllocatable::check(); + IsDynamicallyAllocatable::check(); StaticAssert= 2>::check(); } };