From 140a90f72adf8968033f9b7026cbd9bc12320269 Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Fri, 29 Jan 2016 15:35:40 -0700
Subject: [PATCH] Fix g++4.6 build issues

---
 .../chaiscript/dispatchkit/type_conversions.hpp    |  2 +-
 include/chaiscript/utility/utility.hpp             | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/chaiscript/dispatchkit/type_conversions.hpp b/include/chaiscript/dispatchkit/type_conversions.hpp
index 962d7f3..1fcabe9 100644
--- a/include/chaiscript/dispatchkit/type_conversions.hpp
+++ b/include/chaiscript/dispatchkit/type_conversions.hpp
@@ -319,7 +319,7 @@ namespace chaiscript
   
     template <typename V, typename... Vcount> struct backingList { static std::initializer_list<V> list; };
     template <typename V, typename... Vcount>
-    std::initializer_list<V> backingList<V, Vcount...>::list = { (Vcount)backingValue<V>::value... };
+    std::initializer_list<V> backingList<V, Vcount...>::list = { static_cast<Vcount>(backingValue<V>::value)... };
   
     template <size_t maxLength, typename It, typename V = typename It::value_type, typename... Vcount>
     static typename std::enable_if< sizeof...(Vcount) >= maxLength,
diff --git a/include/chaiscript/utility/utility.hpp b/include/chaiscript/utility/utility.hpp
index 381afda..fbd8c66 100644
--- a/include/chaiscript/utility/utility.hpp
+++ b/include/chaiscript/utility/utility.hpp
@@ -69,21 +69,31 @@ namespace chaiscript
       typename std::enable_if<std::is_enum<Enum>::value, void>::type
       add_class(ModuleType &t_module,
         const std::string &t_class_name,
-        const std::vector<std::pair<typename std::underlying_type<Enum>::type, std::string>> &t_constants)
+#ifdef CHAISCRIPT_GCC_4_6
+        const std::vector<std::pair<int, std::string>> &t_constants
+#else
+        const std::vector<std::pair<typename std::underlying_type<Enum>::type, std::string>> &t_constants
+#endif
+        )
       {
         t_module.add(chaiscript::user_type<Enum>(), t_class_name);
 
         t_module.add(chaiscript::constructor<Enum ()>(), t_class_name);
         t_module.add(chaiscript::constructor<Enum (const Enum &)>(), t_class_name);
 
+        using namespace chaiscript::bootstrap::operators;
         t_module.add([](){
               // add some comparison and assignment operators
-              using namespace chaiscript::bootstrap::operators;
               return assign<Enum>(not_equal<Enum>(equal<Enum>()));
             }());
 
+#ifdef CHAISCRIPT_GCC_4_6
+        t_module.add(chaiscript::fun([](const Enum &e, const int &i) { return e == i; }), "==");
+        t_module.add(chaiscript::fun([](const int &i, const Enum &e) { return i == e; }), "==");
+#else
         t_module.add(chaiscript::fun([](const Enum &e, const typename std::underlying_type<Enum>::type &i) { return e == i; }), "==");
         t_module.add(chaiscript::fun([](const typename std::underlying_type<Enum>::type &i, const Enum &e) { return i == e; }), "==");
+#endif
 
         for (const auto &constant : t_constants)
         {