impl_constants.hpp: macro definitions were moved out of ::uavcan namespace

This commit is contained in:
Pavel Kirienko
2014-03-17 20:51:18 +04:00
parent 3f99cdd607
commit 81a03b4d5e
+9 -7
View File
@@ -6,16 +6,14 @@
#include <uavcan/util/compile_time.hpp>
// 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 };