From 128a8bad1cdff4e8c093d116d31d8e15b87d694f Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Thu, 28 Aug 2014 16:09:21 +0400
Subject: [PATCH] Warning fixes

---
 libuavcan/CMakeLists.txt                   | 7 +++----
 libuavcan/include/uavcan/marshal/array.hpp | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libuavcan/CMakeLists.txt b/libuavcan/CMakeLists.txt
index e733c2f4ae..9da199e095 100644
--- a/libuavcan/CMakeLists.txt
+++ b/libuavcan/CMakeLists.txt
@@ -102,7 +102,6 @@ if (DEBUG_BUILD)
 
     if (COMPILER_IS_GCC_COMPATIBLE)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -pedantic -Wfloat-equal -Wconversion -Wsign-conversion")
-        set(exec_common_flags "")
         set(cpp03_flags "-std=c++03 -Wno-variadic-macros -Wno-long-long")
         set(optim_flags "-O3 -DNDEBUG -g0")
     else ()
@@ -121,9 +120,9 @@ if (DEBUG_BUILD)
 
     # GTest executables
     find_package(GTest REQUIRED)
-    add_libuavcan_test(libuavcan_test       uavcan       "${exec_common_flags}")                 # Default
-    add_libuavcan_test(libuavcan_test_cpp03 uavcan_cpp03 "${exec_common_flags} ${cpp03_flags}")  # C++03
-    add_libuavcan_test(libuavcan_test_optim uavcan_optim "${exec_common_flags} ${optim_flags}")  # Max optimization
+    add_libuavcan_test(libuavcan_test       uavcan       "")                 # Default
+    add_libuavcan_test(libuavcan_test_cpp03 uavcan_cpp03 "${cpp03_flags}")   # C++03
+    add_libuavcan_test(libuavcan_test_optim uavcan_optim "${optim_flags}")   # Max optimization
 else ()
     message(STATUS "Release build type: " ${CMAKE_BUILD_TYPE})
 endif ()
diff --git a/libuavcan/include/uavcan/marshal/array.hpp b/libuavcan/include/uavcan/marshal/array.hpp
index da48265eb9..ba1b54c4a4 100644
--- a/libuavcan/include/uavcan/marshal/array.hpp
+++ b/libuavcan/include/uavcan/marshal/array.hpp
@@ -894,7 +894,7 @@ class UAVCAN_EXPORT YamlStreamer<Array<T, ArrayMode, MaxSize> >
         s << '[';
         for (typename ArrayType::SizeType i = 0; i < array.size(); i++)
         {
-            YamlStreamer<T>::stream(s, array.at(typename ArrayType::SizeType(i)), 0);
+            YamlStreamer<T>::stream(s, array.at(i), 0);
             if ((i + 1) < array.size())
             {
                 s << ", ";