Fix for ubuntu 20.04
This commit is contained in:
4
.vscode/c_cpp_properties.json
vendored
4
.vscode/c_cpp_properties.json
vendored
@ -4,9 +4,7 @@
|
||||
"name": "Linux",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/**",
|
||||
"${workspaceFolder}/include",
|
||||
"${workspaceFolder}/build/_deps/json-src/include/nlohmann",
|
||||
"${workspaceFolder}/build/_deps/json-src/include"
|
||||
"${workspaceFolder}/include"
|
||||
],
|
||||
"defines": ["CROSSLANG_ENABLE_JSON=1","CROSSLANG_ENABLE_THREADING=1","CROSSLANG_ENABLE_FILE_IO=1","CROSSLANG_ENABLE_NETWORK=1","CROSSLANG_ENABLE_TERMIOS=1","CROSSLANG_ENABLE_MBED=1","CROSSLANG_ENABLE_SQLITE=1","CROSSLANG_ENABLE_SDL2=1","-DCROSSLANG_ENABLE_PROCESS=1"],
|
||||
"compilerPath": "/usr/bin/gcc",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
project(TessesCrossLang VERSION 1.0)
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ namespace Tesses::CrossLang
|
||||
for(auto item : dict->items)
|
||||
{
|
||||
if(IsValidForJson(item.second))
|
||||
json_object_setn_new(obj, item.first.c_str(), item.first.size(),JsonSerialize(item.second));
|
||||
json_object_set_new(obj, item.first.c_str(),JsonSerialize(item.second));
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
@ -130,11 +130,11 @@ namespace Tesses::CrossLang
|
||||
size_t len;
|
||||
json_t* value;
|
||||
|
||||
json_object_keylen_foreach_safe(json,n,key,len,value)
|
||||
json_object_foreach_safe(json,n,key,value)
|
||||
{
|
||||
auto itemRes = JsonDeserialize(ls2,value);
|
||||
ls2.GetGC()->BarrierBegin();
|
||||
dict->SetValue(std::string(key,len),itemRes);
|
||||
dict->SetValue(std::string(key),itemRes);
|
||||
ls2.GetGC()->BarrierEnd();
|
||||
}
|
||||
return dict;
|
||||
|
||||
Reference in New Issue
Block a user