Enable binding of const primitives as variables

krisr · Sep 15, 2014 · 38423f4 · 38423f4
1 parent 1a68cc8
commit 38423f4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/LuaIntf/impl/CppBindClass.h b/LuaIntf/impl/CppBindClass.h
@@ -598,7 +598,7 @@ class CppBindClass : public CppBindClassBase
     /**
      * Add or replace a data member.
      */
-    template <typename V>
+    template <typename V, typename std::enable_if<!std::is_const<V>::value>::type* = nullptr>
     CppBindClass<T>& addVariable(const char* name, V T::* v, bool writable = true)
     {
         setMemberGetter(name, LuaRef::createFunction(state(), &CppBindClassVariable<T, V>::get, v));
@@ -609,6 +609,17 @@ class CppBindClass : public CppBindClassBase
         }
         return *this;
     }
+
+        /**
+     * Add or replace a data member.
+     */
+    template <typename V, typename std::enable_if<std::is_const<V>::value>::type* = nullptr>
+    CppBindClass<T>& addVariable(const char* name, V T::* v)
+    {
+        setMemberGetter(name, LuaRef::createFunction(state(), &CppBindClassVariable<T, V>::get, v));
+        setMemberReadOnly(name);
+        return *this;
+    }
 
     /**
      * Add or replace a property member.

diff --git a/LuaIntf/impl/CppBindModule.h b/LuaIntf/impl/CppBindModule.h
@@ -293,7 +293,7 @@ class CppBindModule
         }
         return *this;
     }
-
+  
     /**
      * Add or replace a read-write property.
      */

diff --git a/LuaIntf/impl/LuaType.h b/LuaIntf/impl/LuaType.h
@@ -346,7 +346,8 @@ struct LuaValueType <unsigned long long, lua_Number> : LuaUnsafeInt64Type <unsig
 #define LUA_USING_VALUE_TYPE_EXT(T, V) \
     template <> struct LuaType <T> : LuaValueType <T, V> {}; \
     template <> struct LuaType <T&> : LuaValueType <T, V> {}; \
-    template <> struct LuaType <T const&> : LuaValueType <T, V> {};
+    template <> struct LuaType <T const&> : LuaValueType <T, V> {}; \
+    template <> struct LuaType <T const> : LuaValueType <T, V> {};
 
 #define LUA_USING_VALUE_TYPE(T) \
     LUA_USING_VALUE_TYPE_EXT(T, T)