From cff3a24883a3a7722352178c8957cda92d9b0a51 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Thu, 17 Apr 2014 12:05:02 +0400
Subject: [PATCH] C++ compliance fixes

---
 libuavcan/include/uavcan/driver/can.hpp           | 6 +++---
 libuavcan/include/uavcan/dynamic_memory.hpp       | 2 +-
 libuavcan/include/uavcan/marshal/scalar_codec.hpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libuavcan/include/uavcan/driver/can.hpp b/libuavcan/include/uavcan/driver/can.hpp
index 135769f492..82cea7f5a4 100644
--- a/libuavcan/include/uavcan/driver/can.hpp
+++ b/libuavcan/include/uavcan/driver/can.hpp
@@ -21,9 +21,9 @@ struct UAVCAN_EXPORT CanFrame
 {
     static const uint32_t MaskStdID = 0x000007FF;
     static const uint32_t MaskExtID = 0x1FFFFFFF;
-    static const uint32_t FlagEFF = 1 << 31;                  ///< Extended frame format
-    static const uint32_t FlagRTR = 1 << 30;                  ///< Remote transmission request
-    static const uint32_t FlagERR = 1 << 29;                  ///< Error frame
+    static const uint32_t FlagEFF = 1U << 31;                  ///< Extended frame format
+    static const uint32_t FlagRTR = 1U << 30;                  ///< Remote transmission request
+    static const uint32_t FlagERR = 1U << 29;                  ///< Error frame
 
     static const uint8_t MaxDataLen = 8;
 
diff --git a/libuavcan/include/uavcan/dynamic_memory.hpp b/libuavcan/include/uavcan/dynamic_memory.hpp
index 5203bc33ef..fc5c977151 100644
--- a/libuavcan/include/uavcan/dynamic_memory.hpp
+++ b/libuavcan/include/uavcan/dynamic_memory.hpp
@@ -229,7 +229,7 @@ template <std::size_t PoolSize, std::size_t BlockSize>
 PoolAllocator<PoolSize, BlockSize>::PoolAllocator()
     : free_list_(reinterpret_cast<Node*>(pool_.bytes))
 {
-    memset(pool_.bytes, 0, PoolSize);
+    std::memset(pool_.bytes, 0, PoolSize);
     for (unsigned i = 0; (i + 1) < (NumBlocks - 1 + 1); i++) // -Werror=type-limits
     {
         free_list_[i].next = free_list_ + i + 1;
diff --git a/libuavcan/include/uavcan/marshal/scalar_codec.hpp b/libuavcan/include/uavcan/marshal/scalar_codec.hpp
index 8df53da8b3..27affdb323 100644
--- a/libuavcan/include/uavcan/marshal/scalar_codec.hpp
+++ b/libuavcan/include/uavcan/marshal/scalar_codec.hpp
@@ -107,7 +107,7 @@ int ScalarCodec::encode(const T value)
         uint8_t bytes[sizeof(T)];
     } byte_union;
     byte_union.value = value;
-    clearExtraBits<BitLen>(byte_union.value);
+    clearExtraBits<BitLen, T>(byte_union.value);
     convertByteOrder<BitLen>(byte_union.bytes);
     return encodeBytesImpl(byte_union.bytes, BitLen);
 }