tesses50/crosslang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for ubuntu 20.04

Browse Source
This commit is contained in:
Mike Nolan
2025-01-23 14:02:47 -06:00
parent 3ebdab9401
commit 9c724f7f93
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/c_cpp_properties.json vendored
View File

@ -4,9 +4,7 @@
"name": "Linux", "name": "Linux",
"includePath": [ "includePath": [
"${workspaceFolder}/**", "${workspaceFolder}/**",
"${workspaceFolder}/include", "${workspaceFolder}/include"
"${workspaceFolder}/build/_deps/json-src/include/nlohmann",
"${workspaceFolder}/build/_deps/json-src/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"], "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", "compilerPath": "/usr/bin/gcc",

2
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.16)
project(TessesCrossLang VERSION 1.0) project(TessesCrossLang VERSION 1.0)

6
src/runtime_methods/json.cpp
View File

@ -72,7 +72,7 @@ namespace Tesses::CrossLang
for(auto item : dict->items) for(auto item : dict->items)
{ {
if(IsValidForJson(item.second)) 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; return obj;
} }
@ -130,11 +130,11 @@ namespace Tesses::CrossLang
size_t len; size_t len;
json_t* value; 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); auto itemRes = JsonDeserialize(ls2,value);
ls2.GetGC()->BarrierBegin(); ls2.GetGC()->BarrierBegin();
dict->SetValue(std::string(key,len),itemRes); dict->SetValue(std::string(key),itemRes);
ls2.GetGC()->BarrierEnd(); ls2.GetGC()->BarrierEnd();
} }
return dict; return dict;