From af1eba1b0e9b4e672199f68f5c33f695f3c1905f Mon Sep 17 00:00:00 2001
From: Viktor Rennert <vrennert@squarepx.com>
Date: Tue, 26 Jan 2016 18:36:45 +0100
Subject: [PATCH] Added type fix for gcc/clang and tiny formating fixes.

---
 include/chaiscript/dispatchkit/type_conversions.hpp | 10 ++++++----
 unittests/compiled_tests.cpp                        |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/chaiscript/dispatchkit/type_conversions.hpp b/include/chaiscript/dispatchkit/type_conversions.hpp
index fe181d0..962d7f3 100644
--- a/include/chaiscript/dispatchkit/type_conversions.hpp
+++ b/include/chaiscript/dispatchkit/type_conversions.hpp
@@ -623,7 +623,7 @@ namespace chaiscript
         const std::vector<Boxed_Value> &from_vec = detail::Cast_Helper<const std::vector<Boxed_Value> &>::cast(t_bv, nullptr);
 
         To vec;
-
+        vec.reserve(from_vec.size());
         for (const Boxed_Value &bv : from_vec) {
           vec.push_back(detail::Cast_Helper<typename To::value_type>::cast(bv, nullptr));
         }
@@ -636,13 +636,15 @@ namespace chaiscript
 
 #ifndef CHAISCRIPT_MSVC_12
   template<typename To>
-  Type_Conversion initializer_list_conversion() {
+  Type_Conversion initializer_list_conversion()
+  {
     auto func = [](const Boxed_Value &t_bv) -> Boxed_Value {
       const std::vector<Boxed_Value> &from_vec = detail::Cast_Helper<const std::vector<Boxed_Value> &>::cast(t_bv, nullptr);
 
-      std::vector<To::value_type> vec;
+      std::vector<typename To::value_type> vec;
       vec.reserve(from_vec.size());
-      for (const auto &bv : from_vec) {
+      for (const auto &bv : from_vec)
+      {
         vec.push_back(detail::Cast_Helper<typename To::value_type>::cast(bv, nullptr));
       }
 
diff --git a/unittests/compiled_tests.cpp b/unittests/compiled_tests.cpp
index 2da054a..7c4d769 100644
--- a/unittests/compiled_tests.cpp
+++ b/unittests/compiled_tests.cpp
@@ -928,7 +928,8 @@ TEST_CASE("Return initializer_list")
   CHECK(typeid(decltype(initlist)) == typeid(std::initializer_list<int>));
 }
 
-bool initializer_list_of_enums_interface(std::initializer_list<Utility_Test_Numbers> initlist) {
+bool initializer_list_of_enums_interface(std::initializer_list<Utility_Test_Numbers> initlist)
+{
   return initlist.size() == 3 && *initlist.begin() == THREE;
 }