summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/datamodel/lua
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2017-06-01 14:20:31 (GMT)
committerStefan Radomski <github@mintwerk.de>2017-06-01 14:20:31 (GMT)
commitcfa566ab882b416396aba38252992903658f2a8b (patch)
treedb7a697735e8125abfdd49c3845a26f364291f8b /src/uscxml/plugins/datamodel/lua
parent1e84bbb24e8301ccfcf8ffd98f00447fa566c8a6 (diff)
downloaduscxml-cfa566ab882b416396aba38252992903658f2a8b.zip
uscxml-cfa566ab882b416396aba38252992903658f2a8b.tar.gz
uscxml-cfa566ab882b416396aba38252992903658f2a8b.tar.bz2
SSL support on Win32
Diffstat (limited to 'src/uscxml/plugins/datamodel/lua')
-rw-r--r--src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
index 4f78e7d..92866ee 100644
--- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
@@ -163,9 +163,10 @@ static luabridge::LuaRef getDataAsLua(lua_State* _luaState, const Data& data) {
luaData = luabridge::newTable(_luaState);
std::map<std::string, Data>::const_iterator compoundIter = data.compound.begin();
while(compoundIter != data.compound.end()) {
- if (isInteger(compoundIter->first.c_str(), 10) && strTo<size_t>(compoundIter->first) > 0) {
+ if (isInteger(compoundIter->first.c_str(), 10) && strTo<long>(compoundIter->first) > 0) {
// it makes a difference whether we pass a numeric string or a proper number!
- luaData[strTo<size_t>(compoundIter->first)] = getDataAsLua(_luaState, compoundIter->second);
+ // MSVC throws assertion with LuaBridge for size_t instead of int
+ luaData[strTo<long>(compoundIter->first)] = getDataAsLua(_luaState, compoundIter->second);
} else {
luaData[compoundIter->first] = getDataAsLua(_luaState, compoundIter->second);
}