From 81a03b4d5ef6c03c6b7bafae0535a2565634b23b Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Mon, 17 Mar 2014 20:51:18 +0400 Subject: [PATCH] impl_constants.hpp: macro definitions were moved out of ::uavcan namespace --- libuavcan/include/uavcan/impl_constants.hpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libuavcan/include/uavcan/impl_constants.hpp b/libuavcan/include/uavcan/impl_constants.hpp index 81e31ac374..deaeb8af31 100644 --- a/libuavcan/include/uavcan/impl_constants.hpp +++ b/libuavcan/include/uavcan/impl_constants.hpp @@ -6,16 +6,14 @@ #include - -// TODO: Use git short hash as build id +/** + * UAVCAN version definition + * // TODO: Use git short hash as build id + */ #define UAVCAN_VERSION_MAJOR 0 #define UAVCAN_VERSION_MINOR 1 #define UAVCAN_VERSION_BUILD 0 - -namespace uavcan -{ - /** * UAVCAN can be compiled in C++11 mode. * This macro allows to detect which version of the C++ standard is being used. @@ -53,6 +51,10 @@ namespace uavcan # define UAVCAN_PACKED_END _Pragma("pack(pop)") #endif + +namespace uavcan +{ + /** * Should be OK for any target arch up to AMD64 and any compiler. * The library leverages compile-time checks to ensure that all types that are subject to dynamic allocation @@ -61,7 +63,7 @@ namespace uavcan #if UAVCAN_MEM_POOL_BLOCK_SIZE enum { MemPoolBlockSize = UAVCAN_MEM_POOL_BLOCK_SIZE }; #else -enum { MemPoolBlockSize = 32 + sizeof(void*) * 2 }; +enum { MemPoolBlockSize = 32 + sizeof(void*) * 2 };//!< MemPoolBlockSize #endif enum { MemPoolAlignment = 8 };