fix lua->C++ pass of const references to arithmetic types (make a copy)

pisto · Mar 30, 2014 · 0865f1c · 0865f1c
1 parent b8f1b0c
commit 0865f1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/LuaBridge/LuaBridge.h b/include/LuaBridge/LuaBridge.h
@@ -41,6 +41,7 @@
 
 #include <lua.hpp>
 #include <new>
+#include <type_traits>
 
 #define LUABRIDGE_MAJOR_VERSION 2
 #define LUABRIDGE_MINOR_VERSION 0

diff --git a/include/LuaBridge/detail/TypeList.h b/include/LuaBridge/detail/TypeList.h
@@ -123,10 +123,11 @@ struct TypeListValues <TypeList <Head&, Tail> >
 template <typename Head, typename Tail>
 struct TypeListValues <TypeList <Head const&, Tail> >
 {
-  const Head& hd;
+  using HeadStorage = typename std::conditional<std::is_arithmetic<Head>::value, Head, Head const&>::type;
+  HeadStorage hd;
   TypeListValues <Tail> tl;
 
-  TypeListValues (Head const& hd_, const TypeListValues <Tail>& tl_)
+  TypeListValues (HeadStorage hd_, const TypeListValues <Tail>& tl_)
     : hd (hd_), tl (tl_)
   {
   }